Fixing object names and usability