removed underscores from file and class names