Minor refactorings -- renaming tag to product