Switched to using omni.urls.* everywhere