Make constant and class names more explicit