renamed StringGrammarDefinition -> String
renamed RegularExpressionDefinition -> RegularExpression