This will fix the confusion that results when using the AM interface, but the rspec has CM urns in it.