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

This reverts commit e8e91c8f42246516c80cf15a55193ac0d674d8eb.