refactor(app): Organized naming style - item#1