diff --git a/inc/template.php b/inc/template.php
index 720513b0f4d4f57277f2caf04cce3022875291e0..75f2c12451c7de52b725c13d9376169128c0da24 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -363,8 +363,8 @@ function _tpl_ensureJSINFO() {
     $JSINFO['id']                    = $ID;
     $JSINFO['namespace']             = (string) $INFO['namespace'];
     $JSINFO['ACT']                   = act_clean($ACT);
-    $JSINFO['DOKU_UHN']              = (int) useHeading('navigation');
-    $JSINFO['DOKU_UHC']              = (int) useHeading('content');
+    $JSINFO['useHeadingNavigation']  = (int) useHeading('navigation');
+    $JSINFO['useHeadingContent']     = (int) useHeading('content');
 }
 
 /**
diff --git a/lib/exe/js.php b/lib/exe/js.php
index c6beef745662197186b7fa2be37d2a0a1fda8e8a..3ccc1d66b1efd78b23cb4ca6b10282ea986294d8 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -99,8 +99,8 @@ function js_out(){
                  'secure' => $conf['securecookie'] && is_ssl()
             )).";";
     // FIXME: Move those to JSINFO
-    print "Object.defineProperty(window, 'DOKU_UHN', { get: function() { console.warn('Using DOKU_UHN is deprecated. Please use JSINFO.DOKU_UHN instead'); return JSINFO.DOKU_UHN; } });";
-    print "Object.defineProperty(window, 'DOKU_UHC', { get: function() { console.warn('Using DOKU_UHC is deprecated. Please use JSINFO.DOKU_UHC instead'); return JSINFO.DOKU_UHC; } });";
+    print "Object.defineProperty(window, 'DOKU_UHN', { get: function() { console.warn('Using DOKU_UHN is deprecated. Please use JSINFO.useHeadingNavigation instead'); return JSINFO.useHeadingNavigation; } });";
+    print "Object.defineProperty(window, 'DOKU_UHC', { get: function() { console.warn('Using DOKU_UHC is deprecated. Please use JSINFO.useHeadingContent instead'); return JSINFO.useHeadingContent; } });";
 
     // load JS specific translations
     $lang['js']['plugins'] = js_pluginstrings();