diff --git a/src/directive-predeclared.json b/src/directive-predeclared.json
index 364de44..78e3ec4 100644
--- a/src/directive-predeclared.json
+++ b/src/directive-predeclared.json
@@ -65,19 +65,19 @@
 			"name": "set static text",
 			"doc": "Set the current page's text.\nNormally not used directly; script speech lines call this directive implicitly.",
 			"prefix": "set static text",
-			"prefix_arg": "speech"
+			"prefix_param": "speech"
 		},
 		{
 			"name": "set static speaker",
 			"doc": "Set the current page's speaker.\nNormally not used directly; script speech lines call this directive implicitly.",
 			"prefix": "set static speaker",
-			"prefix_arg": "character"
+			"prefix_param": "character"
 		},
 		{
 			"name": "characters",
 			"doc": "Set the names of characters in the current scene.",
 			"prefix": "characters",
-			"list_arg": "text"
+			"list_param": "text"
 		},
 		{
 			"name": "scene",
@@ -88,27 +88,27 @@
 			"name": "background",
 			"doc": "Set the background image.",
 			"prefix": "background",
-			"prefix_arg": "background"
+			"prefix_param": "background"
 		},
 		{
 			"name": "enter _ stage _",
 			"doc": "Bring a character onto the stage at a given position.",
 			"prefix": "enter",
-			"prefix_arg": "character",
-			"infix": "stage",
-			"infix_arg": "stage position"
+			"prefix_param": "character",
+			"suffix": "stage",
+			"suffix_param": "stage position"
 		},
 		{
 			"name": "enter _",
 			"doc": "Bring a character onto the stage at a default position.",
 			"prefix": "enter",
-			"prefix_arg": "character"
+			"prefix_param": "character"
 		},
 		{
 			"name": "exit _",
 			"doc": "Remove a character from the stage.",
 			"prefix": "exit",
-			"prefix_arg": "character"
+			"prefix_param": "character"
 		},
 		{
 			"name": "exeunt",
diff --git a/src/directive.rs b/src/directive.rs
index 31d955b..bb21cc7 100644
--- a/src/directive.rs
+++ b/src/directive.rs
@@ -8,24 +8,21 @@ pub struct Directive {
     doc: String,
     /// Fixed prefix term.
     prefix: String,
-    /// The type of the prefix argument, if there is one.
-    prefix_arg: Option<Param>,
+    /// The type of the prefix parameter, if there is one.
+    prefix_param: Option<Param>,
     /// Fixed infix term.
-    /// Can only be present if the prefix argument exists.
+    /// Can only be present if the prefix parameter exists.
     infix: Option<String>,
-    /// The type of the infix argument.
+    /// The type of the infix parameter.
     /// Can only be present if the infix term exists.
-    infix_arg: Option<Param>,
+    infix_param: Option<Param>,
     /// Fixed suffix term.
-    /// Can only be present if the infix argument exists.
-    /// Note that this implies directives which have two terms have a prefix
-    /// and an infix, not a prefix and a suffix.
     suffix: Option<String>,
-    /// The type of the suffix argument.
+    /// The type of the suffix parameter.
     /// Can only be present if the suffix exists.
-    suffix_arg: Option<Param>,
-    /// The type of the elements of the list argument, if supported.
-    list_arg: Option<Param>,
+    suffix_param: Option<Param>,
+    /// The type of the elements of the list parameter, if supported.
+    list_param: Option<Param>,
     // TODO(zeph): macro expansion?
 }