          (wrappers (spacemacs//micro-state-create-wrappers name doc bindings))
          (keymap-body (spacemacs//micro-state-fill-map-sexps wrappers)))
     `(defun ,func ()
-       ,(format "%s micro-state." (symbol-name name))
+       ,(format "%S micro-state." name)
        (interactive)
        (let ((doc ,@doc))
          (when doc
            (lv-message (spacemacs//micro-state-propertize-doc
-                        (concat ,(symbol-name name) ": " doc)))))
+                        (format "%S: %s" ',name doc)))))
        ,@on-enter
        (,(if (version< emacs-version "24.4")
              'set-temporary-overlay-map

         (binding-doc (spacemacs/mplist-get binding :doc))
         (binding-pre (spacemacs/mplist-get binding :pre))
         (binding-post (spacemacs/mplist-get binding :post))
         (wrapper-name (intern (format "spacemacs//%s-%s-%s"
                                       (symbol-name name)
                                       (symbol-name wrapped)
                                       key)))
         (wrapper-func
          (eval `(defun ,wrapper-name ()
                   "Auto-generated function"

                         (defdoc ,@default-doc))
                     (if bdoc
                         (lv-message (spacemacs//micro-state-propertize-doc
                                      (format "%S: %s" ',name bdoc)))
                       (when (and defdoc
                                  ',wrapped (not (plist-get ',binding :exit)))
                         (lv-message (spacemacs//micro-state-propertize-doc
                                      (format "%S: %s" ',name defdoc))))))))))
    (append (list (car binding) wrapper-func) binding)))

(defun spacemacs//micro-state-fill-map-sexps (wrappers)
