Change conflicting class names