Renamed table load classes to match API names...