Rename makes to respective product