Renamed serializers appropriately