Made class names smaller