Resolved some naming conflicts