Renamed app and packages