Renamed classes to provide significantly cleaner code.