Resolved some related name issues