Fix object naming