Updated file and class names

Updated the JsonHandler's to match the name of the base class.
Also fixed a few compiler warnings.