removed classname conflicts