Renaming composite objects to be more meaningful