refactor(app): Use more consistent naming conventions