diff --git a/analytical/templatetags/google_analytics_js.py b/analytical/templatetags/google_analytics_js.py
index 055c8f3..f3863a7 100644
--- a/analytical/templatetags/google_analytics_js.py
+++ b/analytical/templatetags/google_analytics_js.py
@@ -49,7 +49,7 @@ def google_analytics_js(parser, token):
 
     Renders Javascript code to track page visits.  You must supply
     your website property ID (as a string) in the
-    ``GOOGLE_ANALYTICS_PROPERTY_ID`` setting.
+    ``GOOGLE_ANALYTICS_JS_PROPERTY_ID`` setting.
     """
     bits = token.split_contents()
     if len(bits) > 1:
@@ -60,7 +60,7 @@ def google_analytics_js(parser, token):
 class GoogleAnalyticsJsNode(Node):
     def __init__(self):
         self.property_id = get_required_setting(
-            'GOOGLE_ANALYTICS_PROPERTY_ID', PROPERTY_ID_RE,
+            'GOOGLE_ANALYTICS_JS_PROPERTY_ID', PROPERTY_ID_RE,
             "must be a string looking like 'UA-XXXXXX-Y'")
 
     def render(self, context):
diff --git a/analytical/tests/test_tag_google_analytics_js.py b/analytical/tests/test_tag_google_analytics_js.py
index 3dbc50b..e3d9389 100644
--- a/analytical/tests/test_tag_google_analytics_js.py
+++ b/analytical/tests/test_tag_google_analytics_js.py
@@ -12,7 +12,7 @@ from analytical.tests.utils import TestCase, TagTestCase
 from analytical.utils import AnalyticalException
 
 
-@override_settings(GOOGLE_ANALYTICS_PROPERTY_ID='UA-123456-7',
+@override_settings(GOOGLE_ANALYTICS_JS_PROPERTY_ID='UA-123456-7',
                    GOOGLE_ANALYTICS_TRACKING_STYLE=TRACK_SINGLE_DOMAIN)
 class GoogleAnalyticsTagTestCase(TagTestCase):
     """
@@ -29,11 +29,11 @@ class GoogleAnalyticsTagTestCase(TagTestCase):
         self.assertTrue("ga('create', 'UA-123456-7', 'auto', {});" in r, r)
         self.assertTrue("ga('send', 'pageview');" in r, r)
 
-    @override_settings(GOOGLE_ANALYTICS_PROPERTY_ID=None)
+    @override_settings(GOOGLE_ANALYTICS_JS_PROPERTY_ID=None)
     def test_no_property_id(self):
         self.assertRaises(AnalyticalException, GoogleAnalyticsJsNode)
 
-    @override_settings(GOOGLE_ANALYTICS_PROPERTY_ID='wrong')
+    @override_settings(GOOGLE_ANALYTICS_JS_PROPERTY_ID='wrong')
     def test_wrong_property_id(self):
         self.assertRaises(AnalyticalException, GoogleAnalyticsJsNode)
 
@@ -147,7 +147,7 @@ ga('send', 'pageview');""" in r, r)
         self.assertRaises(AnalyticalException, GoogleAnalyticsJsNode().render, context)
 
 
-@override_settings(GOOGLE_ANALYTICS_PROPERTY_ID='UA-123456-7',
+@override_settings(GOOGLE_ANALYTICS_JS_PROPERTY_ID='UA-123456-7',
                    GOOGLE_ANALYTICS_TRACKING_STYLE=TRACK_MULTIPLE_DOMAINS,
                    GOOGLE_ANALYTICS_DOMAIN=None,
                    ANALYTICAL_DOMAIN=None)