diff --git a/Implab/Automaton/AutomatonConst.cs b/Implab/Automaton/AutomatonConst.cs
--- a/Implab/Automaton/AutomatonConst.cs
+++ b/Implab/Automaton/AutomatonConst.cs
@@ -1,6 +1,6 @@
 
 namespace Implab.Automaton {
-    public static class DFAConst {
+    public static class AutomatonConst {
         public const int UNREACHABLE_STATE = -1;
 
         public const int UNCLASSIFIED_INPUT = 0;
diff --git a/Implab/Automaton/RegularExpressions/RegularDFA.cs b/Implab/Automaton/RegularExpressions/RegularDFA.cs
--- a/Implab/Automaton/RegularExpressions/RegularDFA.cs
+++ b/Implab/Automaton/RegularExpressions/RegularDFA.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 
 namespace Implab.Automaton.RegularExpressions {
-    public class TaggedDFA<TInput, TTag> : DFATable, ITaggedDFABuilder<TTag> {
+    public class RegularDFA<TInput, TTag> : DFATable, ITaggedDFABuilder<TTag> {
 
         readonly Dictionary<int,TTag[]> m_tags = new Dictionary<int, TTag[]>();
         readonly IAlphabet<TInput> m_alphabet;
 
-        public TaggedDFA(IAlphabet<TInput> alphabet) {
+        public RegularDFA(IAlphabet<TInput> alphabet) {
             Safe.ArgumentNotNull(alphabet, "aplhabet");
 
             m_alphabet = alphabet;
@@ -48,10 +48,10 @@ namespace Implab.Automaton.RegularExpres
         /// Optimize the specified alphabet.
         /// </summary>
         /// <param name="alphabet">Пустой алфавит, который будет зполнен в процессе оптимизации.</param>
-        public TaggedDFA<TInput,TTag> Optimize(IAlphabetBuilder<TInput> alphabet) {
+        public RegularDFA<TInput,TTag> Optimize(IAlphabetBuilder<TInput> alphabet) {
             Safe.ArgumentNotNull(alphabet, "alphabet");
 
-            var dfa = new TaggedDFA<TInput, TTag>(alphabet);
+            var dfa = new RegularDFA<TInput, TTag>(alphabet);
 
             var states = new DummyAlphabet(StateCount);
             var alphaMap = new Dictionary<int,int>();
diff --git a/Implab/Formats/JSON/JSONScanner.cs b/Implab/Formats/JSON/JSONScanner.cs
--- a/Implab/Formats/JSON/JSONScanner.cs
+++ b/Implab/Formats/JSON/JSONScanner.cs
@@ -12,8 +12,8 @@ namespace Implab.Formats.JSON {
     public class JSONScanner : Disposable {
         readonly StringBuilder m_builder = new StringBuilder();
 
-        readonly ScannerContext<JSONGrammar.TokenType> m_jsonContext = JSONGrammar.Instance.JsonDFA;
-        readonly ScannerContext<JSONGrammar.TokenType> m_stringContext = JSONGrammar.Instance.JsonStringDFA;
+        readonly ScannerContext<JSONGrammar.TokenType> m_jsonContext = JSONGrammar.Instance.JsonExpression;
+        readonly ScannerContext<JSONGrammar.TokenType> m_stringContext = JSONGrammar.Instance.JsonStringExpression;
 
 
         readonly TextScanner m_scanner;