Fix object naming.