Removed ProductVariation from ProductCatalogAdmin. Added singular and plural names for ProductAttribute types.