 		},{
 			
 			# Macro definition: Terminator included
-			name: "meta.function.definition.request.with-terminator.$1.roff"
+			name: "meta.function.definition.request.with-terminator.$2.roff"
 			begin: "^([.'])[ \t]*(de|am)\\s*(\\S+)\\s*(\"[^\"]+\"?|\\S+?(?=\\s|\\\\\"))?(.*)$"
 			end:   "^(\\.)[ \t]*((\\4)(?=$|\\s|\\\\(?:$|\")))"
 			beginCaptures:

		},{
			
			# Macro definition: No terminator specified
			name: "meta.function.definition.request.$1.roff"
			begin: "^([.'])[ \t]*(de|am)\\s*(\\S+?)?\\s*(\\\\\".*)?$"
			end:   "^\\.[ \t]*\\."
			beginCaptures:

		},{
			
			# Flow control/conditional requests
			name: "meta.function.request.$2.roff"
			begin: "^([.'])[ \t]*(ie|if|el)"
			end: "(?<!\\\\)(?=\n)"
			beginCaptures:
