Added more types for renaming