Cosmetic changes to make class names more readable.