Made class names smaller
Merge pull request #42 from AndrewBrinker/master

Made class names smaller