removed underscores from class names