Renamed package names for entities