REST classes changed due to package rename