Minor changes to object names