changed class names to avoid collisions