diff --git a/umap/settings/base.py b/umap/settings/base.py
index 5c85470b..101fc8b8 100644
--- a/umap/settings/base.py
+++ b/umap/settings/base.py
@@ -137,6 +137,7 @@ AUTHENTICATION_BACKENDS += (
 LEAFLET_STORAGE_ALLOW_ANONYMOUS = False
 SITE_URL = "http://umap.org"
 UMAP_DEMO_SITE = False
+MAP_SHORT_URL_NAME = "umap_short_url"
 
 #==============================================================================
 # Third party app settings
diff --git a/umap/urls.py b/umap/urls.py
index 688e7d90..a01ad2a7 100644
--- a/umap/urls.py
+++ b/umap/urls.py
@@ -15,7 +15,7 @@ urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
     url(r'', include('social_auth.urls')),
     # We don't want it to be localized
-    url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='map_short_url'),
+    url(r'^m/(?P<pk>\d+)/$', MapShortUrl.as_view(), name='umap_short_url'),
 )
 urlpatterns += i18n_patterns('',
     url(r'^$', views.home, name="home"),