Normalized to "product_variant" in all services

* Fixed tests as well