diff --git a/src/emacs/lean-syntax.el b/src/emacs/lean-syntax.el
index 8ae356a10..333b48b1a 100644
--- a/src/emacs/lean-syntax.el
+++ b/src/emacs/lean-syntax.el
@@ -117,7 +117,7 @@
      ;; modifiers
      (,(rx (or "\[persistent\]" "\[notation\]" "\[visible\]" "\[instance\]" "\[class\]" "\[parsing-only\]"
                "\[coercion\]" "\[reducible\]" "\[off\]" "\[none\]" "\[on\]" "\[wf\]" "\[whnf\]"
-               "\[decls\]" "\[strict\]" "\[local\]"))
+               "\[decls\]" "\[strict\]" "\[local\]" "\[coercions\]" "\[classes\]" "\[notations\]" "\[tactic_hints\]" "\[reduce_hints\]"))
       . 'font-lock-doc-face)
      (,(rx "\[priority" (zero-or-more (not (any "\]"))) "\]") . font-lock-doc-face)
      ;; tactics
diff --git a/src/frontends/lean/parser_config.cpp b/src/frontends/lean/parser_config.cpp
index be895942e..0e2ad05cb 100644
--- a/src/frontends/lean/parser_config.cpp
+++ b/src/frontends/lean/parser_config.cpp
@@ -411,10 +411,10 @@ cmd_table const & get_cmd_table(environment const & env) {
 }
 
 void initialize_parser_config() {
-    token_config::g_class_name = new name("notation");
+    token_config::g_class_name = new name("notations");
     token_config::g_key        = new std::string("tk");
     token_ext::initialize();
-    notation_config::g_class_name = new name("notation");
+    notation_config::g_class_name = new name("notations");
     notation_config::g_key        = new std::string("nota");
     notation_ext::initialize();
     g_ext = new cmd_ext_reg();
diff --git a/src/frontends/lean/tactic_hint.cpp b/src/frontends/lean/tactic_hint.cpp
index 348d6db23..63629dea4 100644
--- a/src/frontends/lean/tactic_hint.cpp
+++ b/src/frontends/lean/tactic_hint.cpp
@@ -57,7 +57,7 @@ template class scoped_ext<tactic_hint_config>;
 typedef scoped_ext<tactic_hint_config> tactic_hint_ext;
 
 void initialize_tactic_hint() {
-    g_class_name = new name("tactic_hint");
+    g_class_name = new name("tactic_hints");
     g_key        = new std::string("tachint");
     tactic_hint_ext::initialize();
 }
diff --git a/src/library/class.cpp b/src/library/class.cpp
index 893b1c1cd..a2fa659f9 100644
--- a/src/library/class.cpp
+++ b/src/library/class.cpp
@@ -275,7 +275,7 @@ list<expr> get_local_instances(type_checker & tc, list<expr> const & ctx, name c
 
 void initialize_class() {
     g_tmp_prefix = new name(name::mk_internal_unique_name());
-    g_class_name = new name("class");
+    g_class_name = new name("classes");
     g_key = new std::string("class");
     class_ext::initialize();
 }
diff --git a/src/library/reducible.cpp b/src/library/reducible.cpp
index 2fde76456..ecdec5809 100644
--- a/src/library/reducible.cpp
+++ b/src/library/reducible.cpp
@@ -77,7 +77,7 @@ typedef scoped_ext<reducible_config> reducible_ext;
 static name * g_tmp_prefix = nullptr;
 
 void initialize_reducible() {
-    g_class_name = new name("reducible");
+    g_class_name = new name("reduce_hints");
     g_key        = new std::string("redu");
     g_tmp_prefix = new name(name::mk_internal_unique_name());
     reducible_ext::initialize();