Updated to use current identifier name as default when renaming identifier (do not add "1")