Renaming subject to annotation where appropriate