Stop using same object name for multiple things