diff --git a/scheme.parser b/scheme.parser
index 67bfd7f..e07c888 100644
--- a/scheme.parser
+++ b/scheme.parser
@@ -1,12 +1,11 @@
-ws:alias         = [ \b\f\n\r\t\v];
-comment:alias    = ";" [^\n]*;
-wsc:alias        = ws | comment;
-number           = "-"? ("0" | [1-9][0-9]*) ("." [0-9]+)? ([eE] [+\-]? [0-9]+)?;
-string           = "\"" ([^\\"] | "\\" .)* "\"";
-symbol           = ([^\\ \n\t\b\f\r\v\"()\[\]#] | "\\" .)+;
-list-form:alias  = "(" wsc* (expression wsc*)* ")"
-                 | "[" wsc* (expression wsc*)* "]";
+whitespace:ws    = [ \b\f\n\r\t\v];
+comment:ws       = ";" [^\n]*;
+number:nows      = "-"? ("0" | [1-9][0-9]*) ("." [0-9]+)? ([eE] [+\-]? [0-9]+)?;
+string:nows      = "\"" ([^\\"] | "\\" .)* "\"";
+symbol:nows      = ([^\\ \n\t\b\f\r\v\"()\[\]#] | "\\" .)+;
+list-form:alias  = "(" expression* ")"
+                 | "[" expression* "]";
 list             = list-form;
 vector           = "#" list-form;
 expression:alias = number | string | symbol | list;
-scheme           = wsc* (expression wsc*)*;
+scheme           = expression*;
diff --git a/sexpr.parser b/sexpr.parser
index 49d77c1..0bc95a6 100644
--- a/sexpr.parser
+++ b/sexpr.parser
@@ -1,5 +1,5 @@
 whitespace:ws    = [ \b\f\n\r\t\v];
-comment:alias:ws = ";" [^\n]*;
+comment:ws       = ";" [^\n]*;
 number:nows      = "-"? ("0" | [1-9][0-9]*) ("." [0-9]+)? ([eE] [+\-]? [0-9]+)?;
 string:nows      = "\"" ([^\\"] | "\\" .)* "\"";
 symbol:nows      = ([^\\ \n\t\b\f\r\v\"()] | "\\" .)+;
diff --git a/whitespace.go b/whitespace.go
index aad0843..fee3c27 100644
--- a/whitespace.go
+++ b/whitespace.go
@@ -1,6 +1,9 @@
 package treerack
 
-import "fmt"
+import (
+	"fmt"
+	"strings"
+)
 
 const whitespaceName = ":ws"
 
@@ -52,6 +55,10 @@ func mergeWhitespaceDefs(ws []definition) definition {
 
 // TODO: validate min and max
 
+func patchName(s ...string) string {
+	return strings.Join(s, ":")
+}
+
 func applyWhitespaceToSeq(s *sequenceDefinition) []definition {
 	var (
 		defs  []definition
@@ -70,7 +77,7 @@ func applyWhitespaceToSeq(s *sequenceDefinition) []definition {
 
 		singleItem := SequenceItem{Name: item.Name, Min: 1, Max: 1}
 
-		restName := item.Name + ":wsrest"
+		restName := patchName(item.Name, s.nodeName(), "wsrest")
 		restDef := newSequence(restName, Alias, []SequenceItem{{Name: whitespaceName, Min: 0, Max: -1}, singleItem})
 		defs = append(defs, restDef)
 
@@ -87,7 +94,7 @@ func applyWhitespaceToSeq(s *sequenceDefinition) []definition {
 			continue
 		}
 
-		optName := item.Name + ":wsopt"
+		optName := patchName(item.Name, s.nodeName(), "wsopt")
 		optDef := newSequence(optName, Alias, []SequenceItem{singleItem, restItems})
 		defs = append(defs, optDef)
 		items = append(items, SequenceItem{Name: optName, Min: 0, Max: 1})
@@ -120,7 +127,7 @@ func applyWhitespace(defs []definition) []definition {
 
 func applyWhitespaceRoot(root definition) (definition, definition) {
 	original, name := root, root.nodeName()
-	wsName := ":wsroot:" + name
+	wsName := patchName(name, "wsroot")
 
 	original.setNodeName(wsName)
 	original.setCommitType(original.commitType() &^ Root)