   (p2l--setup-buffer)
   (delete-matching-lines "^%.*$"))
 
-(defun p2l-remove-useless-macros ()
-  "Delete some LaTeX macro that do not affect output."
+(defun p2l-remove-useless-commands ()
+  "Delete some LaTeX command that do not affect output."
   (interactive)
   (p2l--setup-buffer)
   (while (re-search-forward
           (concat "\\\\"
                   (regexp-opt
-                   (append p2l-editor-macros
-                           p2l-misc-macros-to-remove))
+                   (append p2l-editor-commands
+                           p2l-misc-commands-to-remove))
                   "{")
           nil t)
     (backward-char)


(defun p2l--convert-command0 (latex pillar &optional newline)
  "Transform all LATEX 0-arg commands to PILLAR.
LATEX is the name of a 0-argument macro (e.g., \eg).  PILLAR is
the Pillar markup to replace the macro with.  NEWLINE, if t, will
make sure the replacement text will start on a newline."
  (p2l--setup-buffer)
  (while (p2l--convert-command0-once latex pillar newline)))

(defun p2l--convert-command1-once (latex pillar-begin &optional pillar-end newline)
  "Transform the next LATEX 1-arg command.
LATEX is the name of a 0-argument macro (e.g., \eg).
PILLAR-BEGIN is the Pillar markup to replace the macro name with.
PILLAR-END, if provided, is the Pillar markup that will be
written after the macro's first argument.  NEWLINE, if t, will
make sure the replacement text will start on a newline."
  (when (p2l--convert-command0-once latex pillar-begin newline)
    (let ((start (point))

LATEX is the name of a 0-argument macro (e.g., \eg).  PILLAR is
the Pillar markup to replace the macro with.  NEWLINE, if t, will
make sure the replacement text will start on a newline."
LATEX is the name of a 0-argument command (e.g., \eg).  PILLAR is
  (when (re-search-forward
         (concat "\\\\" latex) nil t)
    (let ((start (match-beginning 0))
