Fixed some naming conflicts