Fixed remaining namespaces due to REST refactoring.