Added component renaming