Resolved some name issues