Updated class names that where changed in the api because they caused build to break.