Modify object name throughout