Removed "Dummy" from some class names.