renaming and annotation