rename tagging in prepare