Removed underscores from class names