Change '-' to '_' in class names