Remove per product cf. Improve name conventions