clear up object names