Renaming tag to product -- minor refactoring

Not sure why the cleanup and refactor commits reappear here.