Fixed classname conflicts