Refactored method names
Renamed app