Fix for some related object names