Reflect changes stemming from the recent app-wide refactoring.