Renamed some activities and packages because they bothered me