Fixed some naming collisions