Renamed all entities to new namespace