Fixed up the received API to match the namespacing and changed class names accordingly.