Corrected the names!

There was a regex mistake, fixed. Now the classes are named the same as before. Fixed inheritance. Someone start work on #11 now..