Fixed some naming conflicts.