made object names more clear