fixed collision in class names