Renamed packages for no specific reason
Fixed renaming flaws