diff --git a/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletion/input/AmbiguousVariablesCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletion/input/AmbiguousVariablesCompletion.tlsp
index 729e3f34d..2f3ecdd5d 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletion/input/AmbiguousVariablesCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletion/input/AmbiguousVariablesCompletion.tlsp
@@ -43,7 +43,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Level1 (Alphanumeric) (Group1::Level1)\",\"kind\":6,\"insertText\":\"Group1::Level1\"},{\"label\":\"ambiguous (Alphanumeric) (Group1::Level1::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level1::ambiguous\"},{\"label\":\"ambiguous (Alphanumeric) (Group1::Level2::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level2::ambiguous\"},{\"label\":\"non-ambiguous-1 (Alphanumeric) (Group1::Level1::non-ambiguous-1)\",\"kind\":6,\"insertText\":\"Group1::Level1::non-ambiguous-1\"},{\"label\":\"Level2 (Alphanumeric) (Group1::Level2)\",\"kind\":6,\"insertText\":\"Group1::Level2\"},{\"label\":\"non-ambiguous-2 (Alphanumeric) (Group1::Level2::non-ambiguous-2)\",\"kind\":6,\"insertText\":\"Group1::Level2::non-ambiguous-2\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"ambiguous (Alphanumeric) (Group1::Level1::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level1::ambiguous\"},{\"label\":\"ambiguous (Alphanumeric) (Group1::Level2::ambiguous)\",\"kind\":6,\"insertText\":\"Group1::Level2::ambiguous\"},{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Level1 (Alphanumeric) (Group1::Level1)\",\"kind\":6,\"insertText\":\"Group1::Level1\"},{\"label\":\"Level2 (Alphanumeric) (Group1::Level2)\",\"kind\":6,\"insertText\":\"Group1::Level2\"},{\"label\":\"non-ambiguous-1 (Alphanumeric) (Group1::Level1::non-ambiguous-1)\",\"kind\":6,\"insertText\":\"Group1::Level1::non-ambiguous-1\"},{\"label\":\"non-ambiguous-2 (Alphanumeric) (Group1::Level2::non-ambiguous-2)\",\"kind\":6,\"insertText\":\"Group1::Level2::non-ambiguous-2\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletionNoTC/input/AmbiguousVariablesCompletionNoTC.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletionNoTC/input/AmbiguousVariablesCompletionNoTC.tlsp
index 45e373130..e07a232c5 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletionNoTC/input/AmbiguousVariablesCompletionNoTC.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/AmbiguousVariablesCompletionNoTC/input/AmbiguousVariablesCompletionNoTC.tlsp
@@ -43,7 +43,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level1 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level1 OF Group1\"},{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level2 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level2 OF Group1\"},{\"label\":\"non-ambiguous-1 (Alphanumeric) (non-ambiguous-1)\",\"kind\":6,\"insertText\":\"non-ambiguous-1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"non-ambiguous-2 (Alphanumeric) (non-ambiguous-2)\",\"kind\":6,\"insertText\":\"non-ambiguous-2\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level1 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level1 OF Group1\"},{\"label\":\"ambiguous (Alphanumeric) (ambiguous OF Level2 OF Group1)\",\"kind\":6,\"insertText\":\"ambiguous OF Level2 OF Group1\"},{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"non-ambiguous-1 (Alphanumeric) (non-ambiguous-1)\",\"kind\":6,\"insertText\":\"non-ambiguous-1\"},{\"label\":\"non-ambiguous-2 (Alphanumeric) (non-ambiguous-2)\",\"kind\":6,\"insertText\":\"non-ambiguous-2\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterWhen2/input/CompletionAfterWhen2.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterWhen2/input/CompletionAfterWhen2.tlsp
index dfa4dfed7..925935e2d 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterWhen2/input/CompletionAfterWhen2.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/CompletionAfterWhen2/input/CompletionAfterWhen2.tlsp
@@ -31,7 +31,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Var1 (Alphanumeric) (Var1)\",\"kind\":6,\"insertText\":\"Var1\"},{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Group1-Var1 (Alphanumeric) (Group1::Group1-Var1)\",\"kind\":6,\"insertText\":\"Group1::Group1-Var1\"},{\"label\":\"Group1-Var2 (Alphanumeric) (Group1::Group1-Var2)\",\"kind\":6,\"insertText\":\"Group1::Group1-Var2\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"1\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"Group1-Var1 (Alphanumeric) (Group1::Group1-Var1)\",\"kind\":6,\"insertText\":\"Group1::Group1-Var1\"},{\"label\":\"Group1-Var2 (Alphanumeric) (Group1::Group1-Var2)\",\"kind\":6,\"insertText\":\"Group1::Group1-Var2\"},{\"label\":\"Var1 (Alphanumeric) (Var1)\",\"kind\":6,\"insertText\":\"Var1\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CompletionUsingCopy/input/CompletionUsingCopy.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CompletionUsingCopy/input/CompletionUsingCopy.tlsp
index 987233443..c66599572 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/CompletionUsingCopy/input/CompletionUsingCopy.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/CompletionUsingCopy/input/CompletionUsingCopy.tlsp
@@ -55,7 +55,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"YISCTST (Alphanumeric) (YISCTST)\",\"kind\":6,\"insertText\":\"YISCTST\"},{\"label\":\"TST-ISC-LL (Numeric) (TST-ISC-LL)\",\"kind\":6,\"insertText\":\"TST-ISC-LL\"},{\"label\":\"TST-ISC-CODE-MVS (Alphanumeric) (TST-ISC-CODE-MVS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-MVS\"},{\"label\":\"TST-ISC-CODE-IMS (Alphanumeric) (TST-ISC-CODE-IMS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-IMS\"},{\"label\":\"TST-ISC-CODE-CENTRE (Alphanumeric) (TST-ISC-CODE-CENTRE)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-CENTRE\"},{\"label\":\"TST-ISC-NOM (Alphanumeric) (TST-ISC-NOM)\",\"kind\":6,\"insertText\":\"TST-ISC-NOM\"},{\"label\":\"TST-ISC-NOM-FULL (Alphanumeric) (TST-ISC-NOM-FULL)\",\"kind\":6,\"insertText\":\"TST-ISC-NOM-FULL\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TST-ISC-CODE-CENTRE (Alphanumeric) (TST-ISC-CODE-CENTRE)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-CENTRE\"},{\"label\":\"TST-ISC-CODE-IMS (Alphanumeric) (TST-ISC-CODE-IMS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-IMS\"},{\"label\":\"TST-ISC-CODE-MVS (Alphanumeric) (TST-ISC-CODE-MVS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-MVS\"},{\"label\":\"TST-ISC-LL (Numeric) (TST-ISC-LL)\",\"kind\":6,\"insertText\":\"TST-ISC-LL\"},{\"label\":\"TST-ISC-NOM (Alphanumeric) (TST-ISC-NOM)\",\"kind\":6,\"insertText\":\"TST-ISC-NOM\"},{\"label\":\"TST-ISC-NOM-FULL (Alphanumeric) (TST-ISC-NOM-FULL)\",\"kind\":6,\"insertText\":\"TST-ISC-NOM-FULL\"},{\"label\":\"YISCTST (Alphanumeric) (YISCTST)\",\"kind\":6,\"insertText\":\"YISCTST\"}]}}"
     },
     {
       "category": 0,
@@ -87,7 +87,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TST-ISC-LL (Numeric) (TST-ISC-LL)\",\"kind\":6,\"insertText\":\"TST-ISC-LL\"},{\"label\":\"TST-ISC-CODE-MVS (Alphanumeric) (TST-ISC-CODE-MVS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-MVS\"},{\"label\":\"TST-ISC-CODE-IMS (Alphanumeric) (TST-ISC-CODE-IMS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-IMS\"},{\"label\":\"TST-ISC-CODE-CENTRE (Alphanumeric) (TST-ISC-CODE-CENTRE)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-CENTRE\"},{\"label\":\"TST-ISC-NOM (Alphanumeric) (TST-ISC-NOM)\",\"kind\":6,\"insertText\":\"TST-ISC-NOM\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TST-ISC-CODE-CENTRE (Alphanumeric) (TST-ISC-CODE-CENTRE)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-CENTRE\"},{\"label\":\"TST-ISC-CODE-IMS (Alphanumeric) (TST-ISC-CODE-IMS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-IMS\"},{\"label\":\"TST-ISC-CODE-MVS (Alphanumeric) (TST-ISC-CODE-MVS)\",\"kind\":6,\"insertText\":\"TST-ISC-CODE-MVS\"},{\"label\":\"TST-ISC-LL (Numeric) (TST-ISC-LL)\",\"kind\":6,\"insertText\":\"TST-ISC-LL\"},{\"label\":\"TST-ISC-NOM (Alphanumeric) (TST-ISC-NOM)\",\"kind\":6,\"insertText\":\"TST-ISC-NOM\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedProgram/input/CompletionWithNestedProgram.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedProgram/input/CompletionWithNestedProgram.tlsp
index ccc5c9e73..1d8f25635 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedProgram/input/CompletionWithNestedProgram.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedProgram/input/CompletionWithNestedProgram.tlsp
@@ -111,7 +111,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"DateOrdinal\",\"kind\":19,\"insertText\":\"DateOrdinal.\"},{\"label\":\"DateDB2\",\"kind\":19,\"insertText\":\"DateDB2.\"},{\"label\":\"Time6\",\"kind\":19,\"insertText\":\"Time6.\"},{\"label\":\"Time8\",\"kind\":19,\"insertText\":\"Time8.\"},{\"label\":\"TimeDB2\",\"kind\":19,\"insertText\":\"TimeDB2.\"},{\"label\":\"TimeStampDB2\",\"kind\":19,\"insertText\":\"TimeStampDB2.\"},{\"label\":\"CountryISO2\",\"kind\":19,\"insertText\":\"CountryISO2.\"},{\"label\":\"SmallInt\",\"kind\":19,\"insertText\":\"SmallInt.\"},{\"label\":\"Integer\",\"kind\":19,\"insertText\":\"Integer.\"},{\"label\":\"BigInt\",\"kind\":19,\"insertText\":\"BigInt.\"},{\"label\":\"Real\",\"kind\":19,\"insertText\":\"Real.\"},{\"label\":\"Float\",\"kind\":19,\"insertText\":\"Float.\"},{\"label\":\"BOOL\",\"kind\":19,\"insertText\":\"BOOL.\"},{\"label\":\"DATE\",\"kind\":19,\"insertText\":\"DATE.\"},{\"label\":\"CURRENCY\",\"kind\":19,\"insertText\":\"CURRENCY.\"},{\"label\":\"STRING\",\"kind\":19,\"insertText\":\"STRING.\"},{\"label\":\"ProcCall\",\"kind\":9},{\"label\":\"NestedProg\",\"kind\":9}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"BigInt\",\"kind\":19,\"insertText\":\"BigInt.\"},{\"label\":\"BOOL\",\"kind\":19,\"insertText\":\"BOOL.\"},{\"label\":\"CountryISO2\",\"kind\":19,\"insertText\":\"CountryISO2.\"},{\"label\":\"CURRENCY\",\"kind\":19,\"insertText\":\"CURRENCY.\"},{\"label\":\"DATE\",\"kind\":19,\"insertText\":\"DATE.\"},{\"label\":\"DateDB2\",\"kind\":19,\"insertText\":\"DateDB2.\"},{\"label\":\"DateOrdinal\",\"kind\":19,\"insertText\":\"DateOrdinal.\"},{\"label\":\"Float\",\"kind\":19,\"insertText\":\"Float.\"},{\"label\":\"Integer\",\"kind\":19,\"insertText\":\"Integer.\"},{\"label\":\"Real\",\"kind\":19,\"insertText\":\"Real.\"},{\"label\":\"SmallInt\",\"kind\":19,\"insertText\":\"SmallInt.\"},{\"label\":\"STRING\",\"kind\":19,\"insertText\":\"STRING.\"},{\"label\":\"Time6\",\"kind\":19,\"insertText\":\"Time6.\"},{\"label\":\"Time8\",\"kind\":19,\"insertText\":\"Time8.\"},{\"label\":\"TimeDB2\",\"kind\":19,\"insertText\":\"TimeDB2.\"},{\"label\":\"TimeStampDB2\",\"kind\":19,\"insertText\":\"TimeStampDB2.\"},{\"label\":\"NestedProg\",\"kind\":9},{\"label\":\"ProcCall\",\"kind\":9}]}}"
     },
     {
       "category": 0,
@@ -155,7 +155,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"var2 (Numeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"YYYY (Numeric) (groupA-1::groupA-2::varA::YYYY)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA::YYYY\"},{\"label\":\"YYYY (Numeric) (groupB-1::groupB-2::varB::YYYY)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB::YYYY\"},{\"label\":\"MM (Numeric) (groupA-1::groupA-2::varA::MM)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA::MM\"},{\"label\":\"MM (Numeric) (groupB-1::groupB-2::varB::MM)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB::MM\"},{\"label\":\"DD (Numeric) (groupA-1::groupA-2::varA::DD)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA::DD\"},{\"label\":\"DD (Numeric) (groupB-1::groupB-2::varB::DD)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB::DD\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"DD (Numeric) (groupA-1::groupA-2::varA::DD)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA::DD\"},{\"label\":\"DD (Numeric) (groupB-1::groupB-2::varB::DD)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB::DD\"},{\"label\":\"MM (Numeric) (groupA-1::groupA-2::varA::MM)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA::MM\"},{\"label\":\"MM (Numeric) (groupB-1::groupB-2::varB::MM)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB::MM\"},{\"label\":\"var2 (Numeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"YYYY (Numeric) (groupA-1::groupA-2::varA::YYYY)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA::YYYY\"},{\"label\":\"YYYY (Numeric) (groupB-1::groupB-2::varB::YYYY)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB::YYYY\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedType/input/CompletionWithNestedType.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedType/input/CompletionWithNestedType.tlsp
index adfabee5e..560ed66b1 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedType/input/CompletionWithNestedType.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/CompletionWithNestedType/input/CompletionWithNestedType.tlsp
@@ -35,7 +35,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"7\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"var2 (Numeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"var3 (Numeric) (var3)\",\"kind\":6,\"insertText\":\"var3\"},{\"label\":\"var4 (Numeric) (var4)\",\"kind\":6,\"insertText\":\"var4\"},{\"label\":\"varA (Numeric) (groupA-1::groupA-2::varA)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA\"},{\"label\":\"varB (Numeric) (groupB-1::groupB-2::varB)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB\"},{\"label\":\"len (Numeric) (myUberType1::len)\",\"kind\":6,\"insertText\":\"myUberType1::len\"},{\"label\":\"YYYY (Numeric) (myUberType1::YYYY)\",\"kind\":6,\"insertText\":\"myUberType1::YYYY\"},{\"label\":\"MM (Numeric) (myUberType1::MM)\",\"kind\":6,\"insertText\":\"myUberType1::MM\"},{\"label\":\"DD (Numeric) (myUberType1::DD)\",\"kind\":6,\"insertText\":\"myUberType1::DD\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"7\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"DD (Numeric) (myUberType1::DD)\",\"kind\":6,\"insertText\":\"myUberType1::DD\"},{\"label\":\"len (Numeric) (myUberType1::len)\",\"kind\":6,\"insertText\":\"myUberType1::len\"},{\"label\":\"MM (Numeric) (myUberType1::MM)\",\"kind\":6,\"insertText\":\"myUberType1::MM\"},{\"label\":\"var2 (Numeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"var3 (Numeric) (var3)\",\"kind\":6,\"insertText\":\"var3\"},{\"label\":\"var4 (Numeric) (var4)\",\"kind\":6,\"insertText\":\"var4\"},{\"label\":\"varA (Numeric) (groupA-1::groupA-2::varA)\",\"kind\":6,\"insertText\":\"groupA-1::groupA-2::varA\"},{\"label\":\"varB (Numeric) (groupB-1::groupB-2::varB)\",\"kind\":6,\"insertText\":\"groupB-1::groupB-2::varB\"},{\"label\":\"YYYY (Numeric) (myUberType1::YYYY)\",\"kind\":6,\"insertText\":\"myUberType1::YYYY\"}]}}"
     }
   ],
   "didClose": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/didClose\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/SMEDILOL/AppData/Local/Temp/1/tcbl/DVZS00016431885148411321515.cee\"}}}",
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletion/input/DisplayCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletion/input/DisplayCompletion.tlsp
index 9dbb6f811..6e263c39d 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletion/input/DisplayCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletion/input/DisplayCompletion.tlsp
@@ -75,7 +75,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"VarLevel2 (Alphanumeric) (Level1::Level2::VarLevel2)\",\"kind\":6,\"insertText\":\"Level1::Level2::VarLevel2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"VarLevel2-2 (Alphanumeric) (Level1::Level2-2::VarLevel2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2::VarLevel2-2\"},{\"label\":\"MyBool (BOOL) (Level1::MyBool)\",\"kind\":6,\"insertText\":\"Level1::MyBool\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"MyBool (BOOL) (Level1::MyBool)\",\"kind\":6,\"insertText\":\"Level1::MyBool\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"VarLevel2 (Alphanumeric) (Level1::Level2::VarLevel2)\",\"kind\":6,\"insertText\":\"Level1::Level2::VarLevel2\"},{\"label\":\"VarLevel2-2 (Alphanumeric) (Level1::Level2-2::VarLevel2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2::VarLevel2-2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletionNoTC/input/DisplayCompletionNoTC.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletionNoTC/input/DisplayCompletionNoTC.tlsp
index 505d0f531..2b63427d4 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletionNoTC/input/DisplayCompletionNoTC.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/DisplayCompletionNoTC/input/DisplayCompletionNoTC.tlsp
@@ -75,7 +75,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Date (Numeric) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Bool (Numeric) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-OutDate (Numeric) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"VarLevel2 (Alphanumeric) (VarLevel2)\",\"kind\":6,\"insertText\":\"VarLevel2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level2-2)\",\"kind\":6,\"insertText\":\"Level2-2\"},{\"label\":\"VarLevel2-2 (Alphanumeric) (VarLevel2-2)\",\"kind\":6,\"insertText\":\"VarLevel2-2\"},{\"label\":\"MyBool (Numeric) (MyBool)\",\"kind\":6,\"insertText\":\"MyBool\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level2-2)\",\"kind\":6,\"insertText\":\"Level2-2\"},{\"label\":\"MyBool (Numeric) (MyBool)\",\"kind\":6,\"insertText\":\"MyBool\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"VarLevel2 (Alphanumeric) (VarLevel2)\",\"kind\":6,\"insertText\":\"VarLevel2\"},{\"label\":\"VarLevel2-2 (Alphanumeric) (VarLevel2-2)\",\"kind\":6,\"insertText\":\"VarLevel2-2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (Numeric) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (Numeric) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-OutDate (Numeric) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/GlobalStorageCompletion/input/GlobalStorageCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/GlobalStorageCompletion/input/GlobalStorageCompletion.tlsp
index 2b7fba5a7..6889b3314 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/GlobalStorageCompletion/input/GlobalStorageCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/GlobalStorageCompletion/input/GlobalStorageCompletion.tlsp
@@ -103,7 +103,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Param1 (BOOL) (Param1)\",\"kind\":6,\"insertText\":\"Param1\"},{\"label\":\"PW-TestVar (DATE) (PW-TestVar)\",\"kind\":6,\"insertText\":\"PW-TestVar\"},{\"label\":\"G-StorVar (BOOL) (G-StorVar)\",\"kind\":6,\"insertText\":\"G-StorVar\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"5\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"G-StorVar (BOOL) (G-StorVar)\",\"kind\":6,\"insertText\":\"G-StorVar\"},{\"label\":\"Param1 (BOOL) (Param1)\",\"kind\":6,\"insertText\":\"Param1\"},{\"label\":\"PW-TestVar (DATE) (PW-TestVar)\",\"kind\":6,\"insertText\":\"PW-TestVar\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/GlobalWithNestedProgramCompletion/input/GlobalWithNestedProgramCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/GlobalWithNestedProgramCompletion/input/GlobalWithNestedProgramCompletion.tlsp
index 373263465..919f82a7e 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/GlobalWithNestedProgramCompletion/input/GlobalWithNestedProgramCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/GlobalWithNestedProgramCompletion/input/GlobalWithNestedProgramCompletion.tlsp
@@ -63,7 +63,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"zedzed (BOOL) (zedzed)\",\"kind\":6,\"insertText\":\"zedzed\"},{\"label\":\"MyDataGlobal (DATE) (MyDataGlobal)\",\"kind\":6,\"insertText\":\"MyDataGlobal\"},{\"label\":\"GlobalGroup (Alphanumeric) (GlobalGroup)\",\"kind\":6,\"insertText\":\"GlobalGroup\"},{\"label\":\"globalChildren1 (BOOL) (GlobalGroup::globalChildren1)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren1\"},{\"label\":\"globalChildren2 (Alphanumeric) (GlobalGroup::globalChildren2)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren2\"},{\"label\":\"childrenGlobal (DATE) (GlobalGroup::globalChildren2::childrenGlobal)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren2::childrenGlobal\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"childrenGlobal (DATE) (GlobalGroup::globalChildren2::childrenGlobal)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren2::childrenGlobal\"},{\"label\":\"globalChildren1 (BOOL) (GlobalGroup::globalChildren1)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren1\"},{\"label\":\"globalChildren2 (Alphanumeric) (GlobalGroup::globalChildren2)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren2\"},{\"label\":\"GlobalGroup (Alphanumeric) (GlobalGroup)\",\"kind\":6,\"insertText\":\"GlobalGroup\"},{\"label\":\"MyDataGlobal (DATE) (MyDataGlobal)\",\"kind\":6,\"insertText\":\"MyDataGlobal\"},{\"label\":\"zedzed (BOOL) (zedzed)\",\"kind\":6,\"insertText\":\"zedzed\"}]}}"
     },
     {
       "category": 0,
@@ -107,7 +107,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"MyDataGlobal (DATE) (MyDataGlobal)\",\"kind\":6,\"insertText\":\"MyDataGlobal\"},{\"label\":\"GlobalGroup (Alphanumeric) (GlobalGroup)\",\"kind\":6,\"insertText\":\"GlobalGroup\"},{\"label\":\"globalChildren2 (Alphanumeric) (GlobalGroup::globalChildren2)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren2\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"globalChildren2 (Alphanumeric) (GlobalGroup::globalChildren2)\",\"kind\":6,\"insertText\":\"GlobalGroup::globalChildren2\"},{\"label\":\"GlobalGroup (Alphanumeric) (GlobalGroup)\",\"kind\":6,\"insertText\":\"GlobalGroup\"},{\"label\":\"MyDataGlobal (DATE) (MyDataGlobal)\",\"kind\":6,\"insertText\":\"MyDataGlobal\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/IfCompletion/input/IfCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/IfCompletion/input/IfCompletion.tlsp
index 119b19f62..8b918e592 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/IfCompletion/input/IfCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/IfCompletion/input/IfCompletion.tlsp
@@ -55,7 +55,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"55\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestLevel88 (Level88) (TestLevel::TestLevel88)\",\"kind\":6,\"insertText\":\"TestLevel::TestLevel88\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"VarLevel2 (Alphanumeric) (Level1::Level2::VarLevel2)\",\"kind\":6,\"insertText\":\"Level1::Level2::VarLevel2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"VarLevel2-2 (Alphanumeric) (Level1::Level2-2::VarLevel2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2::VarLevel2-2\"},{\"label\":\"MyBool (BOOL) (Level1::MyBool)\",\"kind\":6,\"insertText\":\"Level1::MyBool\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"55\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"MyBool (BOOL) (Level1::MyBool)\",\"kind\":6,\"insertText\":\"Level1::MyBool\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestLevel88 (Level88) (TestLevel::TestLevel88)\",\"kind\":6,\"insertText\":\"TestLevel::TestLevel88\"},{\"label\":\"VarLevel2 (Alphanumeric) (Level1::Level2::VarLevel2)\",\"kind\":6,\"insertText\":\"Level1::Level2::VarLevel2\"},{\"label\":\"VarLevel2-2 (Alphanumeric) (Level1::Level2-2::VarLevel2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2::VarLevel2-2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/MoveZeroSpaceCompletion/input/MoveZeroSpaceCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/MoveZeroSpaceCompletion/input/MoveZeroSpaceCompletion.tlsp
index b6aa2fb8a..1bac3de76 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/MoveZeroSpaceCompletion/input/MoveZeroSpaceCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/MoveZeroSpaceCompletion/input/MoveZeroSpaceCompletion.tlsp
@@ -95,7 +95,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"len (Numeric) (len)\",\"kind\":6,\"insertText\":\"len\"},{\"label\":\"var2 (Alphanumeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"MyLevel1Test (Alphanumeric) (MyLevel1Test)\",\"kind\":6,\"insertText\":\"MyLevel1Test\"},{\"label\":\"buf (Alphanumeric) (MyLevel1Test::buf)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf\"},{\"label\":\"char (Alphanumeric) (MyLevel1Test::buf::char)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf::char\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"buf (Alphanumeric) (MyLevel1Test::buf)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf\"},{\"label\":\"char (Alphanumeric) (MyLevel1Test::buf::char)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf::char\"},{\"label\":\"len (Numeric) (len)\",\"kind\":6,\"insertText\":\"len\"},{\"label\":\"MyLevel1Test (Alphanumeric) (MyLevel1Test)\",\"kind\":6,\"insertText\":\"MyLevel1Test\"},{\"label\":\"var2 (Alphanumeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"}]}}"
     },
     {
       "category": 0,
@@ -179,7 +179,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"var2 (Alphanumeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"MyLevel1Test (Alphanumeric) (MyLevel1Test)\",\"kind\":6,\"insertText\":\"MyLevel1Test\"},{\"label\":\"buf (Alphanumeric) (MyLevel1Test::buf)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf\"},{\"label\":\"char (Alphanumeric) (MyLevel1Test::buf::char)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf::char\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"buf (Alphanumeric) (MyLevel1Test::buf)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf\"},{\"label\":\"char (Alphanumeric) (MyLevel1Test::buf::char)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf::char\"},{\"label\":\"MyLevel1Test (Alphanumeric) (MyLevel1Test)\",\"kind\":6,\"insertText\":\"MyLevel1Test\"},{\"label\":\"var2 (Alphanumeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"}]}}"
     },
     {
       "category": 0,
@@ -263,7 +263,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"len (Numeric) (len)\",\"kind\":6,\"insertText\":\"len\"},{\"label\":\"var2 (Alphanumeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"MyLevel1Test (Alphanumeric) (MyLevel1Test)\",\"kind\":6,\"insertText\":\"MyLevel1Test\"},{\"label\":\"buf (Alphanumeric) (MyLevel1Test::buf)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf\"},{\"label\":\"char (Alphanumeric) (MyLevel1Test::buf::char)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf::char\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"buf (Alphanumeric) (MyLevel1Test::buf)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf\"},{\"label\":\"char (Alphanumeric) (MyLevel1Test::buf::char)\",\"kind\":6,\"insertText\":\"MyLevel1Test::buf::char\"},{\"label\":\"len (Numeric) (len)\",\"kind\":6,\"insertText\":\"len\"},{\"label\":\"MyLevel1Test (Alphanumeric) (MyLevel1Test)\",\"kind\":6,\"insertText\":\"MyLevel1Test\"},{\"label\":\"var2 (Alphanumeric) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/PerformCompletion/input/PerformCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/PerformCompletion/input/PerformCompletion.tlsp
index afe9c1ec8..bc9324b62 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/PerformCompletion/input/PerformCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/PerformCompletion/input/PerformCompletion.tlsp
@@ -43,7 +43,7 @@
     },
     {
         "category": 1,
-        "message": "{\"jsonrpc\":\"2.0\",\"id\":\"35\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Parag1\",\"kind\":18},{\"label\":\"Parag2\",\"kind\":18},{\"label\":\"Parag3\",\"kind\":18},{\"label\":\"Parag4\",\"kind\":18},{\"label\":\"Parag5\",\"kind\":18},{\"label\":\"Parag6\",\"kind\":18},{\"label\":\"Sec1\",\"kind\":18},{\"label\":\"Sec2\",\"kind\":18},{\"label\":\"W-Numeric PIC9(10)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"TestLevel PIC9\",\"kind\":6,\"insertText\":\"TestLevel\"}]}}"
+        "message": "{\"jsonrpc\":\"2.0\",\"id\":\"35\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Parag1\",\"kind\":18},{\"label\":\"Parag2\",\"kind\":18},{\"label\":\"Parag3\",\"kind\":18},{\"label\":\"Parag4\",\"kind\":18},{\"label\":\"Parag5\",\"kind\":18},{\"label\":\"Parag6\",\"kind\":18},{\"label\":\"Sec1\",\"kind\":18},{\"label\":\"Sec2\",\"kind\":18},{\"label\":\"TestLevel PIC 9\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"W-Numeric PIC 9(10)\",\"kind\":6,\"insertText\":\"W-Numeric\"}]}}"
     },
     {
         "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput/input/ProcedureCompletionInputInoutOutput.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput/input/ProcedureCompletionInputInoutOutput.tlsp
index 4a3c3073c..9d27cd1c3 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput/input/ProcedureCompletionInputInoutOutput.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput/input/ProcedureCompletionInputInoutOutput.tlsp
@@ -67,7 +67,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"37\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"FirstName\",\"kind\":6,\"insertText\":\"FirstName\"},{\"label\":\"LastName\",\"kind\":6,\"insertText\":\"LastName\"},{\"label\":\"MiddleName\",\"kind\":6,\"insertText\":\"MiddleName\"},{\"label\":\"Gender\",\"kind\":6,\"insertText\":\"Gender\"},{\"label\":\"Height\",\"kind\":6,\"insertText\":\"Height\"},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"37\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"FirstName\",\"kind\":6,\"insertText\":\"FirstName\"},{\"label\":\"Gender\",\"kind\":6,\"insertText\":\"Gender\"},{\"label\":\"Height\",\"kind\":6,\"insertText\":\"Height\"},{\"label\":\"LastName\",\"kind\":6,\"insertText\":\"LastName\"},{\"label\":\"MiddleName\",\"kind\":6,\"insertText\":\"MiddleName\"},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
     },
     {
       "category": 0,
@@ -103,7 +103,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"40\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"40\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -167,7 +167,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"46\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"46\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -203,7 +203,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"49\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"49\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -343,7 +343,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"51\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"FirstName\",\"kind\":6,\"insertText\":\"FirstName\"},{\"label\":\"LastName\",\"kind\":6,\"insertText\":\"LastName\"},{\"label\":\"MiddleName\",\"kind\":6,\"insertText\":\"MiddleName\"},{\"label\":\"Gender\",\"kind\":6,\"insertText\":\"Gender\"},{\"label\":\"Height\",\"kind\":6,\"insertText\":\"Height\"},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"51\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"FirstName\",\"kind\":6,\"insertText\":\"FirstName\"},{\"label\":\"Gender\",\"kind\":6,\"insertText\":\"Gender\"},{\"label\":\"Height\",\"kind\":6,\"insertText\":\"Height\"},{\"label\":\"LastName\",\"kind\":6,\"insertText\":\"LastName\"},{\"label\":\"MiddleName\",\"kind\":6,\"insertText\":\"MiddleName\"},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
     },
     {
       "category": 0,
@@ -379,7 +379,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"54\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"54\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -415,7 +415,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -447,7 +447,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"60\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"60\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -483,7 +483,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"63\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"63\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput_EI/input/ProcedureCompletionInputInoutOutput.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput_EI/input/ProcedureCompletionInputInoutOutput.tlsp
index 9aa4f4003..fff34854c 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput_EI/input/ProcedureCompletionInputInoutOutput.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionInputInoutOutput_EI/input/ProcedureCompletionInputInoutOutput.tlsp
@@ -67,7 +67,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"37\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"37\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
     },
     {
       "category": 0,
@@ -103,7 +103,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"40\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"40\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -167,7 +167,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"46\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"46\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -203,7 +203,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"49\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"49\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -343,7 +343,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"51\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"51\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"AProcedureTest input FirstName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric) in-out BirthDate(DATE) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"IN-OUT BirthDate(DATE)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"AProcedureTest input FirstName(Alphanumeric), LastName(Alphanumeric), MiddleName(Alphanumeric), ImaginaryName(Alphanumeric) output Gender(Alphanumeric), Height(Alphanumeric)\",\"kind\":2,\"insertText\":\"AProcedureTest input\",\"data\":[null,{\"label\":\"DVZF0OSM.AProcedureTest\",\"parameters\":[{\"label\":\"INPUT FirstName(Alphanumeric)\"},{\"label\":\"LastName(Alphanumeric)\"},{\"label\":\"MiddleName(Alphanumeric)\"},{\"label\":\"ImaginaryName(Alphanumeric)\"},{\"label\":\"OUTPUT Gender(Alphanumeric)\"},{\"label\":\"Height(Alphanumeric)\"}]},null]},{\"label\":\"NoContext input param1(DATE) in-out param2(DATE), param3(DATE) output param4(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"},{\"label\":\"OUTPUT param4(DATE)\"}]},null]},{\"label\":\"NoContext input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE) output param5(DATE)\",\"kind\":2,\"insertText\":\"NoContext input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContext\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"},{\"label\":\"OUTPUT param5(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE) output param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"OUTPUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextAndWithoutInOut input param1(DATE), param2(DATE) output param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextAndWithoutInOut input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextAndWithoutInOut\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"OUTPUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE) in-out param2(DATE), param3(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"IN-OUT param2(DATE)\"},{\"label\":\"param3(DATE)\"}]},null]},{\"label\":\"NoContextWithoutOutput input param1(DATE), param2(DATE) in-out param3(DATE), param4(DATE)\",\"kind\":2,\"insertText\":\"NoContextWithoutOutput input\",\"data\":[null,{\"label\":\"DVZF0OSM.NoContextWithoutOutput\",\"parameters\":[{\"label\":\"INPUT param1(DATE)\"},{\"label\":\"param2(DATE)\"},{\"label\":\"IN-OUT param3(DATE)\"},{\"label\":\"param4(DATE)\"}]},null]},{\"label\":\"DVZF0OSM\",\"kind\":9}]}}"
     },
     {
       "category": 0,
@@ -379,7 +379,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"54\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"54\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -415,7 +415,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"57\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -447,7 +447,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"60\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"60\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
@@ -483,7 +483,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"63\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"},{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"63\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"FirstName (Alphanumeric) (Person::FirstName)\",\"kind\":6,\"insertText\":\"Person::FirstName\"},{\"label\":\"Gender (Alphanumeric) (Person::Gender)\",\"kind\":6,\"insertText\":\"Person::Gender\"},{\"label\":\"Height (Alphanumeric) (Person::Height)\",\"kind\":6,\"insertText\":\"Person::Height\"},{\"label\":\"LastName (Alphanumeric) (Person::LastName)\",\"kind\":6,\"insertText\":\"Person::LastName\"},{\"label\":\"MiddleName (Alphanumeric) (Person::MiddleName)\",\"kind\":6,\"insertText\":\"Person::MiddleName\"},{\"label\":\"Person (Alphanumeric) (Person)\",\"kind\":6,\"insertText\":\"Person\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/QualifiedNameCompletionWithFiller/input/QualifiedNameCompletionWithFiller.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/QualifiedNameCompletionWithFiller/input/QualifiedNameCompletionWithFiller.tlsp
index 75de55a98..7c620c124 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/QualifiedNameCompletionWithFiller/input/QualifiedNameCompletionWithFiller.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/QualifiedNameCompletionWithFiller/input/QualifiedNameCompletionWithFiller.tlsp
@@ -135,7 +135,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"var2 (DATE) (var2)\",\"kind\":6,\"insertText\":\"var2\"},{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Group1 (Alphanumeric) (Group1)\",\"kind\":6,\"insertText\":\"Group1\"},{\"label\":\"var2 (DATE) (var2)\",\"kind\":6,\"insertText\":\"var2\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/SetToAddressOfCompletion/input/SetToAddressOfCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/SetToAddressOfCompletion/input/SetToAddressOfCompletion.tlsp
index aa8812b6e..5a36fb558 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/SetToAddressOfCompletion/input/SetToAddressOfCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/SetToAddressOfCompletion/input/SetToAddressOfCompletion.tlsp
@@ -43,7 +43,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"47\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestLevel88 (Level88) (TestLevel::TestLevel88)\",\"kind\":6,\"insertText\":\"TestLevel::TestLevel88\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"47\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestLevel88 (Level88) (TestLevel::TestLevel88)\",\"kind\":6,\"insertText\":\"TestLevel::TestLevel88\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"}]}}"
     },
     {
       "category": 0,
@@ -71,7 +71,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"49\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"YYYY (Numeric) (W-Date::YYYY)\",\"kind\":6,\"insertText\":\"W-Date::YYYY\"},{\"label\":\"YYYY (Numeric) (W-OutDate::YYYY)\",\"kind\":6,\"insertText\":\"W-OutDate::YYYY\"},{\"label\":\"MM (Numeric) (W-Date::MM)\",\"kind\":6,\"insertText\":\"W-Date::MM\"},{\"label\":\"MM (Numeric) (W-OutDate::MM)\",\"kind\":6,\"insertText\":\"W-OutDate::MM\"},{\"label\":\"DD (Numeric) (W-Date::DD)\",\"kind\":6,\"insertText\":\"W-Date::DD\"},{\"label\":\"DD (Numeric) (W-OutDate::DD)\",\"kind\":6,\"insertText\":\"W-OutDate::DD\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"49\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"DD (Numeric) (W-Date::DD)\",\"kind\":6,\"insertText\":\"W-Date::DD\"},{\"label\":\"DD (Numeric) (W-OutDate::DD)\",\"kind\":6,\"insertText\":\"W-OutDate::DD\"},{\"label\":\"MM (Numeric) (W-Date::MM)\",\"kind\":6,\"insertText\":\"W-Date::MM\"},{\"label\":\"MM (Numeric) (W-OutDate::MM)\",\"kind\":6,\"insertText\":\"W-OutDate::MM\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"YYYY (Numeric) (W-Date::YYYY)\",\"kind\":6,\"insertText\":\"W-Date::YYYY\"},{\"label\":\"YYYY (Numeric) (W-OutDate::YYYY)\",\"kind\":6,\"insertText\":\"W-OutDate::YYYY\"}]}}"
     },
     {
       "category": 0,
@@ -133,7 +133,6 @@
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/didChange\",\"params\":{\"textDocument\":{\"version\":0,\"uri\":\"file:/C:/Users/COLLARBE/AppData/Local/Temp/tcbl/PROCCALL1017554363682126440.cee\"},\"uri\":\"file:/C:/Users/COLLARBE/AppData/Local/Temp/tcbl/PROCCALL1017554363682126440.cee\",\"contentChanges\":[{\"range\":{\"start\":{\"line\":21,\"character\":28},\"end\":{\"line\":21,\"character\":28}},\"rangeLength\":0,\"text\":\"ADDRESS OF \"}]}}"
     },
-    
     {
       "category": 0,
       "message": "{\"jsonrpc\":\"2.0\",\"id\":\"51\",\"method\":\"typecobol/refreshNodesRequest\",\"params\":{\"textDocument\":{\"uri\":\"file:/C:/Users/COLLARBE/AppData/Local/Temp/tcbl/PROCCALL1017554363682126440.cee\"}}}"
@@ -152,7 +151,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"52\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"52\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletion/input/SimpleMoveToCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletion/input/SimpleMoveToCompletion.tlsp
index ab196544d..fd9166950 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletion/input/SimpleMoveToCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletion/input/SimpleMoveToCompletion.tlsp
@@ -51,7 +51,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"VarLevel2 (Numeric) (Level1::Level2::VarLevel2)\",\"kind\":6,\"insertText\":\"Level1::Level2::VarLevel2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"VarLevel2-2 (Numeric) (Level1::Level2-2::VarLevel2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2::VarLevel2-2\"},{\"label\":\"MyBool (BOOL) (Level1::MyBool)\",\"kind\":6,\"insertText\":\"Level1::MyBool\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"MyBool (BOOL) (Level1::MyBool)\",\"kind\":6,\"insertText\":\"Level1::MyBool\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"VarLevel2 (Numeric) (Level1::Level2::VarLevel2)\",\"kind\":6,\"insertText\":\"Level1::Level2::VarLevel2\"},{\"label\":\"VarLevel2-2 (Numeric) (Level1::Level2-2::VarLevel2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2::VarLevel2-2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-OutDate (DATE) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"}]}}"
     },
     {
       "category": 0,
@@ -79,7 +79,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level1::Level2)\",\"kind\":6,\"insertText\":\"Level1::Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level1::Level2-2)\",\"kind\":6,\"insertText\":\"Level1::Level2-2\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletionNoTC/input/SimpleMoveToCompletionNoTC.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletionNoTC/input/SimpleMoveToCompletionNoTC.tlsp
index 2c1275870..f2fb1e9a9 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletionNoTC/input/SimpleMoveToCompletionNoTC.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/SimpleMoveToCompletionNoTC/input/SimpleMoveToCompletionNoTC.tlsp
@@ -51,7 +51,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Date (Numeric) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Bool (Numeric) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-OutDate (Numeric) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"VarLevel2 (Numeric) (VarLevel2)\",\"kind\":6,\"insertText\":\"VarLevel2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level2-2)\",\"kind\":6,\"insertText\":\"Level2-2\"},{\"label\":\"VarLevel2-2 (Numeric) (VarLevel2-2)\",\"kind\":6,\"insertText\":\"VarLevel2-2\"},{\"label\":\"MyAlpha (Alphanumeric) (MyAlpha)\",\"kind\":6,\"insertText\":\"MyAlpha\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"4\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level2-2)\",\"kind\":6,\"insertText\":\"Level2-2\"},{\"label\":\"MyAlpha (Alphanumeric) (MyAlpha)\",\"kind\":6,\"insertText\":\"MyAlpha\"},{\"label\":\"TestLevel (Numeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"VarLevel2 (Numeric) (VarLevel2)\",\"kind\":6,\"insertText\":\"VarLevel2\"},{\"label\":\"VarLevel2-2 (Numeric) (VarLevel2-2)\",\"kind\":6,\"insertText\":\"VarLevel2-2\"},{\"label\":\"W-Alphabetic (Alphabetic) (W-Alphabetic)\",\"kind\":6,\"insertText\":\"W-Alphabetic\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (Numeric) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (Numeric) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-OutDate (Numeric) (W-OutDate)\",\"kind\":6,\"insertText\":\"W-OutDate\"}]}}"
     },
     {
       "category": 0,
@@ -79,7 +79,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level2-2)\",\"kind\":6,\"insertText\":\"Level2-2\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"6\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"Level1 (Alphanumeric) (Level1)\",\"kind\":6,\"insertText\":\"Level1\"},{\"label\":\"Level2 (Alphanumeric) (Level2)\",\"kind\":6,\"insertText\":\"Level2\"},{\"label\":\"Level2-2 (Alphanumeric) (Level2-2)\",\"kind\":6,\"insertText\":\"Level2-2\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/TypeCompletion/input/TypeCompletion.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/TypeCompletion/input/TypeCompletion.tlsp
index c8fe62901..1acc09342 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/TypeCompletion/input/TypeCompletion.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/TypeCompletion/input/TypeCompletion.tlsp
@@ -44,7 +44,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"DateOrdinal\",\"kind\":19,\"insertText\":\"DateOrdinal.\"},{\"label\":\"DateDB2\",\"kind\":19,\"insertText\":\"DateDB2.\"},{\"label\":\"Time6\",\"kind\":19,\"insertText\":\"Time6.\"},{\"label\":\"Time8\",\"kind\":19,\"insertText\":\"Time8.\"},{\"label\":\"TimeDB2\",\"kind\":19,\"insertText\":\"TimeDB2.\"},{\"label\":\"TimeStampDB2\",\"kind\":19,\"insertText\":\"TimeStampDB2.\"},{\"label\":\"CountryISO2\",\"kind\":19,\"insertText\":\"CountryISO2.\"},{\"label\":\"SmallInt\",\"kind\":19,\"insertText\":\"SmallInt.\"},{\"label\":\"Integer\",\"kind\":19,\"insertText\":\"Integer.\"},{\"label\":\"BigInt\",\"kind\":19,\"insertText\":\"BigInt.\"},{\"label\":\"Real\",\"kind\":19,\"insertText\":\"Real.\"},{\"label\":\"Float\",\"kind\":19,\"insertText\":\"Float.\"},{\"label\":\"BOOL\",\"kind\":19,\"insertText\":\"BOOL.\"},{\"label\":\"DATE\",\"kind\":19,\"insertText\":\"DATE.\"},{\"label\":\"CURRENCY\",\"kind\":19,\"insertText\":\"CURRENCY.\"},{\"label\":\"STRING\",\"kind\":19,\"insertText\":\"STRING.\"},{\"label\":\"TestingPgm\",\"kind\":9}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"BigInt\",\"kind\":19,\"insertText\":\"BigInt.\"},{\"label\":\"BOOL\",\"kind\":19,\"insertText\":\"BOOL.\"},{\"label\":\"CountryISO2\",\"kind\":19,\"insertText\":\"CountryISO2.\"},{\"label\":\"CURRENCY\",\"kind\":19,\"insertText\":\"CURRENCY.\"},{\"label\":\"DATE\",\"kind\":19,\"insertText\":\"DATE.\"},{\"label\":\"DateDB2\",\"kind\":19,\"insertText\":\"DateDB2.\"},{\"label\":\"DateOrdinal\",\"kind\":19,\"insertText\":\"DateOrdinal.\"},{\"label\":\"Float\",\"kind\":19,\"insertText\":\"Float.\"},{\"label\":\"Integer\",\"kind\":19,\"insertText\":\"Integer.\"},{\"label\":\"Real\",\"kind\":19,\"insertText\":\"Real.\"},{\"label\":\"SmallInt\",\"kind\":19,\"insertText\":\"SmallInt.\"},{\"label\":\"STRING\",\"kind\":19,\"insertText\":\"STRING.\"},{\"label\":\"Time6\",\"kind\":19,\"insertText\":\"Time6.\"},{\"label\":\"Time8\",\"kind\":19,\"insertText\":\"Time8.\"},{\"label\":\"TimeDB2\",\"kind\":19,\"insertText\":\"TimeDB2.\"},{\"label\":\"TimeStampDB2\",\"kind\":19,\"insertText\":\"TimeStampDB2.\"},{\"label\":\"TestingPgm\",\"kind\":9}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/LSRTests/VariableQualifiedNameCompletion2/input/VaraibleQualifiedNameCompletion2.tlsp b/TypeCobol.LanguageServer.Test/LSRTests/VariableQualifiedNameCompletion2/input/VaraibleQualifiedNameCompletion2.tlsp
index 2f488136d..f509657fc 100644
--- a/TypeCobol.LanguageServer.Test/LSRTests/VariableQualifiedNameCompletion2/input/VaraibleQualifiedNameCompletion2.tlsp
+++ b/TypeCobol.LanguageServer.Test/LSRTests/VariableQualifiedNameCompletion2/input/VaraibleQualifiedNameCompletion2.tlsp
@@ -84,7 +84,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestVar (BOOL) (TestVar)\",\"kind\":6,\"insertText\":\"TestVar\"},{\"label\":\"TestLevel (Alphanumeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"2\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestLevel (Alphanumeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestVar (BOOL) (TestVar)\",\"kind\":6,\"insertText\":\"TestVar\"}]}}"
     },
     {
       "category": 0,
@@ -216,7 +216,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"9\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-SecondDate (DATE) (W-SecondDate)\",\"kind\":6,\"insertText\":\"W-SecondDate\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"MyGroup (Alphanumeric) (MyGroup)\",\"kind\":6,\"insertText\":\"MyGroup\"},{\"label\":\"MyBoool (BOOL) (MyGroup::MyBoool)\",\"kind\":6,\"insertText\":\"MyGroup::MyBoool\"},{\"label\":\"MyDatePointer (Alphanumeric) (MyDatePointer)\",\"kind\":6,\"insertText\":\"MyDatePointer\"},{\"label\":\"TestType (MyType) (TestType)\",\"kind\":6,\"insertText\":\"TestType\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"9\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"MyBoool (BOOL) (MyGroup::MyBoool)\",\"kind\":6,\"insertText\":\"MyGroup::MyBoool\"},{\"label\":\"MyDatePointer (Alphanumeric) (MyDatePointer)\",\"kind\":6,\"insertText\":\"MyDatePointer\"},{\"label\":\"MyGroup (Alphanumeric) (MyGroup)\",\"kind\":6,\"insertText\":\"MyGroup\"},{\"label\":\"TestType (MyType) (TestType)\",\"kind\":6,\"insertText\":\"TestType\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-Bool (BOOL) (W-Bool)\",\"kind\":6,\"insertText\":\"W-Bool\"},{\"label\":\"W-Date (DATE) (W-Date)\",\"kind\":6,\"insertText\":\"W-Date\"},{\"label\":\"W-Numeric (Numeric) (W-Numeric)\",\"kind\":6,\"insertText\":\"W-Numeric\"},{\"label\":\"W-SecondDate (DATE) (W-SecondDate)\",\"kind\":6,\"insertText\":\"W-SecondDate\"}]}}"
     },
     {
       "category": 0,
@@ -256,7 +256,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"11\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"W-SecondDate (DATE) (W-SecondDate)\",\"kind\":6,\"insertText\":\"W-SecondDate\"},{\"label\":\"Varia (DATE) (TestType::Varia)\",\"kind\":6,\"insertText\":\"TestType::Varia\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"MyGroup (Alphanumeric) (MyGroup)\",\"kind\":6,\"insertText\":\"MyGroup\"},{\"label\":\"MyDatePointer (Alphanumeric) (MyDatePointer)\",\"kind\":6,\"insertText\":\"MyDatePointer\"},{\"label\":\"TestLevel (Alphanumeric) (TestType::TestLevel)\",\"kind\":6,\"insertText\":\"TestType::TestLevel\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"11\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"MyDatePointer (Alphanumeric) (MyDatePointer)\",\"kind\":6,\"insertText\":\"MyDatePointer\"},{\"label\":\"MyGroup (Alphanumeric) (MyGroup)\",\"kind\":6,\"insertText\":\"MyGroup\"},{\"label\":\"TestLevel (Alphanumeric) (TestType::TestLevel)\",\"kind\":6,\"insertText\":\"TestType::TestLevel\"},{\"label\":\"Varia (DATE) (TestType::Varia)\",\"kind\":6,\"insertText\":\"TestType::Varia\"},{\"label\":\"W-Alphanum (Alphanumeric) (W-Alphanum)\",\"kind\":6,\"insertText\":\"W-Alphanum\"},{\"label\":\"W-SecondDate (DATE) (W-SecondDate)\",\"kind\":6,\"insertText\":\"W-SecondDate\"}]}}"
     },
     {
       "category": 0,
@@ -328,7 +328,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"13\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestVar (BOOL) (TestVar)\",\"kind\":6,\"insertText\":\"TestVar\"},{\"label\":\"TestLevel (Alphanumeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"13\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestLevel (Alphanumeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestVar (BOOL) (TestVar)\",\"kind\":6,\"insertText\":\"TestVar\"}]}}"
     },
     {
       "category": 0,
@@ -628,7 +628,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"20\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"MyTestLevel (Level88) (MyTestLevel)\",\"kind\":6,\"insertText\":\"MyTestLevel\"},{\"label\":\"MyBoool (BOOL) (MyBoool)\",\"kind\":6,\"insertText\":\"MyBoool\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"20\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"MyBoool (BOOL) (MyBoool)\",\"kind\":6,\"insertText\":\"MyBoool\"},{\"label\":\"MyTestLevel (Level88) (MyTestLevel)\",\"kind\":6,\"insertText\":\"MyTestLevel\"}]}}"
     },
     {
       "category": 0,
@@ -860,7 +860,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"22\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestVar (BOOL) (TestVar)\",\"kind\":6,\"insertText\":\"TestVar\"},{\"label\":\"TestLevel (Alphanumeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"id\":\"22\",\"result\":{\"isIncomplete\":false,\"items\":[{\"label\":\"TestLevel (Alphanumeric) (TestLevel)\",\"kind\":6,\"insertText\":\"TestLevel\"},{\"label\":\"TestVar (BOOL) (TestVar)\",\"kind\":6,\"insertText\":\"TestVar\"}]}}"
     },
     {
       "category": 0,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterText.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterText.txt
index af37b63d8..e417e0398 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterText.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterText.txt
@@ -41,39 +41,39 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "proc1",
+    "label": "another-proc1",
     "kind": 3,
-    "insertText": "proc1",
+    "insertText": "another-proc1",
     "data": [
       null,
       {
-        "label": "TCOMFL06.proc1",
+        "label": "TCOMFL06.another-proc1",
         "parameters": []
       },
       null
     ]
   },
   {
-    "label": "another-proc1",
+    "label": "func1",
     "kind": 3,
-    "insertText": "another-proc1",
+    "insertText": "func1",
     "data": [
       null,
       {
-        "label": "TCOMFL06.another-proc1",
+        "label": "TCOMFL06.func1",
         "parameters": []
       },
       null
     ]
   },
   {
-    "label": "func1",
+    "label": "proc1",
     "kind": 3,
-    "insertText": "func1",
+    "insertText": "proc1",
     "data": [
       null,
       {
-        "label": "TCOMFL06.func1",
+        "label": "TCOMFL06.proc1",
         "parameters": []
       },
       null
@@ -85,19 +85,19 @@
     "insertText": "VAR1"
   },
   {
-    "label": "TCOMFL06",
+    "label": "AnotherNested",
     "kind": 9
   },
   {
-    "label": "ProcNested1",
+    "label": "NestedProc1",
     "kind": 9
   },
   {
-    "label": "NestedProc1",
+    "label": "ProcNested1",
     "kind": 9
   },
   {
-    "label": "AnotherNested",
+    "label": "TCOMFL06",
     "kind": 9
   }
 ]
\ No newline at end of file
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterTextEI.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterTextEI.txt
index a9bd0b2a8..3824bc563 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterTextEI.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterCall/WithoutUserFilterTextEI.txt
@@ -40,58 +40,58 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "proc1",
+    "label": "another-proc1",
     "kind": 3,
-    "insertText": "proc1",
+    "insertText": "another-proc1",
     "data": [
       null,
       {
-        "label": "TCOMFL06.proc1",
+        "label": "TCOMFL06.another-proc1",
         "parameters": []
       },
       null
     ]
   },
   {
-    "label": "another-proc1",
+    "label": "func1",
     "kind": 3,
-    "insertText": "another-proc1",
+    "insertText": "func1",
     "data": [
       null,
       {
-        "label": "TCOMFL06.another-proc1",
+        "label": "TCOMFL06.func1",
         "parameters": []
       },
       null
     ]
   },
   {
-    "label": "func1",
+    "label": "proc1",
     "kind": 3,
-    "insertText": "func1",
+    "insertText": "proc1",
     "data": [
       null,
       {
-        "label": "TCOMFL06.func1",
+        "label": "TCOMFL06.proc1",
         "parameters": []
       },
       null
     ]
   },
   {
-    "label": "TCOMFL06",
+    "label": "AnotherNested",
     "kind": 9
   },
   {
-    "label": "ProcNested1",
+    "label": "NestedProc1",
     "kind": 9
   },
   {
-    "label": "NestedProc1",
+    "label": "ProcNested1",
     "kind": 9
   },
   {
-    "label": "AnotherNested",
+    "label": "TCOMFL06",
     "kind": 9
   }
 ]
\ No newline at end of file
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingHyphens.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingHyphens.txt
index cc0f440e4..40172e356 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingHyphens.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingHyphens.txt
@@ -46,9 +46,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
+    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP1-SAY",
     "data": {
       "start": {
         "line": 30,
@@ -76,9 +76,9 @@
     }
   },
   {
-    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
+    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1-SAY",
+    "insertText": "SAY-POINTER",
     "data": {
       "start": {
         "line": 30,
@@ -91,9 +91,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Alphanumeric) (GROUP1-SAY::VAR2-SAY)",
+    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "GROUP1-SAY::VAR2-SAY",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 30,
@@ -121,9 +121,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
+    "label": "SAY77 (Alphanumeric) (SAY77)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "SAY77",
     "data": {
       "start": {
         "line": 30,
@@ -136,9 +136,9 @@
     }
   },
   {
-    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
+    "label": "VAR2-SAY (Alphanumeric) (GROUP1-SAY::VAR2-SAY)",
     "kind": 6,
-    "insertText": "SAY-POINTER",
+    "insertText": "GROUP1-SAY::VAR2-SAY",
     "data": {
       "start": {
         "line": 30,
@@ -151,9 +151,9 @@
     }
   },
   {
-    "label": "SAY77 (Alphanumeric) (SAY77)",
+    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "SAY77",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 30,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingUnderscores.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingUnderscores.txt
index 9ba75cbba..33b6e7f2e 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingUnderscores.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterDisplay/NamesUsingUnderscores.txt
@@ -46,9 +46,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "GROUP1_SAY (Alphanumeric) (GROUP1_SAY)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP1_SAY",
     "data": {
       "start": {
         "line": 30,
@@ -76,9 +76,9 @@
     }
   },
   {
-    "label": "GROUP1_SAY (Alphanumeric) (GROUP1_SAY)",
+    "label": "SAY_POINTER (Alphanumeric) (SAY_POINTER)",
     "kind": 6,
-    "insertText": "GROUP1_SAY",
+    "insertText": "SAY_POINTER",
     "data": {
       "start": {
         "line": 30,
@@ -91,9 +91,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Alphanumeric) (GROUP1_SAY::VAR2_SAY)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "GROUP1_SAY::VAR2_SAY",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 30,
@@ -121,9 +121,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "SAY77 (Alphanumeric) (SAY77)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "SAY77",
     "data": {
       "start": {
         "line": 30,
@@ -136,9 +136,9 @@
     }
   },
   {
-    "label": "SAY_POINTER (Alphanumeric) (SAY_POINTER)",
+    "label": "VAR2_SAY (Alphanumeric) (GROUP1_SAY::VAR2_SAY)",
     "kind": 6,
-    "insertText": "SAY_POINTER",
+    "insertText": "GROUP1_SAY::VAR2_SAY",
     "data": {
       "start": {
         "line": 30,
@@ -151,9 +151,9 @@
     }
   },
   {
-    "label": "SAY77 (Alphanumeric) (SAY77)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "SAY77",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 30,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Chain2.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Chain2.txt
index 5dd0e5142..22be88639 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Chain2.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Chain2.txt
@@ -42,9 +42,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-MAIN-GROUP1 (Alphanumeric) (SAY-MAIN-GROUP1)",
+    "label": "SAY-GROUP2 (Alphanumeric) (SAY-GROUP2 IN SAY-MAIN-GROUP2)",
     "kind": 6,
-    "insertText": "SAY-MAIN-GROUP1",
+    "insertText": "SAY-GROUP2 IN SAY-MAIN-GROUP2",
     "data": {
       "start": {
         "line": 34,
@@ -57,9 +57,9 @@
     }
   },
   {
-    "label": "SAY-GROUP2 (Alphanumeric) (SAY-GROUP2 IN SAY-MAIN-GROUP2)",
+    "label": "SAY-GROUP3 (Alphanumeric) (SAY-GROUP3 IN NOT-MAIN-GLOUP)",
     "kind": 6,
-    "insertText": "SAY-GROUP2 IN SAY-MAIN-GROUP2",
+    "insertText": "SAY-GROUP3 IN NOT-MAIN-GLOUP",
     "data": {
       "start": {
         "line": 34,
@@ -72,9 +72,9 @@
     }
   },
   {
-    "label": "SAY-MAIN-GROUP2 (Alphanumeric) (SAY-MAIN-GROUP2)",
+    "label": "SAY-MAIN-GROUP1 (Alphanumeric) (SAY-MAIN-GROUP1)",
     "kind": 6,
-    "insertText": "SAY-MAIN-GROUP2",
+    "insertText": "SAY-MAIN-GROUP1",
     "data": {
       "start": {
         "line": 34,
@@ -87,9 +87,9 @@
     }
   },
   {
-    "label": "SAY-GROUP3 (Alphanumeric) (SAY-GROUP3 IN NOT-MAIN-GLOUP)",
+    "label": "SAY-MAIN-GROUP2 (Alphanumeric) (SAY-MAIN-GROUP2)",
     "kind": 6,
-    "insertText": "SAY-GROUP3 IN NOT-MAIN-GLOUP",
+    "insertText": "SAY-MAIN-GROUP2",
     "data": {
       "start": {
         "line": 34,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Filler.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Filler.txt
index f3913fc27..4d221d339 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Filler.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Filler.txt
@@ -26,13 +26,13 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "GROUP-WITH-FILLER (Alphanumeric) (GROUP-WITH-FILLER)",
+    "label": "GROUP-WITH-ANONYMOUS (Alphanumeric) (GROUP-WITH-ANONYMOUS)",
     "kind": 6,
-    "insertText": "GROUP-WITH-FILLER"
+    "insertText": "GROUP-WITH-ANONYMOUS"
   },
   {
-    "label": "GROUP-WITH-ANONYMOUS (Alphanumeric) (GROUP-WITH-ANONYMOUS)",
+    "label": "GROUP-WITH-FILLER (Alphanumeric) (GROUP-WITH-FILLER)",
     "kind": 6,
-    "insertText": "GROUP-WITH-ANONYMOUS"
+    "insertText": "GROUP-WITH-FILLER"
   }
 ]
\ No newline at end of file
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/SeveralParents.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/SeveralParents.txt
index 37067c563..62a499f0c 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/SeveralParents.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/SeveralParents.txt
@@ -23,9 +23,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SUB-GROUP1 (Alphanumeric) (SUB-GROUP1 IN MAIN-GROUP1)",
+    "label": "MAIN-GROUP1 (Alphanumeric) (MAIN-GROUP1)",
     "kind": 6,
-    "insertText": "SUB-GROUP1 IN MAIN-GROUP1",
+    "insertText": "MAIN-GROUP1",
     "data": {
       "start": {
         "line": 15,
@@ -38,9 +38,9 @@
     }
   },
   {
-    "label": "MAIN-GROUP1 (Alphanumeric) (MAIN-GROUP1)",
+    "label": "MAIN-GROUP2 (Alphanumeric) (MAIN-GROUP2)",
     "kind": 6,
-    "insertText": "MAIN-GROUP1",
+    "insertText": "MAIN-GROUP2",
     "data": {
       "start": {
         "line": 15,
@@ -53,9 +53,9 @@
     }
   },
   {
-    "label": "MAIN-GROUP2 (Alphanumeric) (MAIN-GROUP2)",
+    "label": "SUB-GROUP1 (Alphanumeric) (SUB-GROUP1 IN MAIN-GROUP1)",
     "kind": 6,
-    "insertText": "MAIN-GROUP2",
+    "insertText": "SUB-GROUP1 IN MAIN-GROUP1",
     "data": {
       "start": {
         "line": 15,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Variable.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Variable.txt
index c17a360b6..5ab887780 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Variable.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterIn/Variable.txt
@@ -43,9 +43,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-GROUP1 (Alphanumeric) (SAY-GROUP1)",
+    "label": "GROUP2-SAY (Alphanumeric) (GROUP2-SAY)",
     "kind": 6,
-    "insertText": "SAY-GROUP1",
+    "insertText": "GROUP2-SAY",
     "data": {
       "start": {
         "line": 27,
@@ -58,9 +58,9 @@
     }
   },
   {
-    "label": "GROUP2-SAY (Alphanumeric) (GROUP2-SAY)",
+    "label": "GROUP3-SAY-GROUP3 (Alphanumeric) (GROUP3-SAY-GROUP3)",
     "kind": 6,
-    "insertText": "GROUP2-SAY",
+    "insertText": "GROUP3-SAY-GROUP3",
     "data": {
       "start": {
         "line": 27,
@@ -73,9 +73,9 @@
     }
   },
   {
-    "label": "GROUP3-SAY-GROUP3 (Alphanumeric) (GROUP3-SAY-GROUP3)",
+    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF IN GROUP-QUALIF-1)",
     "kind": 6,
-    "insertText": "GROUP3-SAY-GROUP3",
+    "insertText": "SAY-GROUP-QUALIF IN GROUP-QUALIF-1",
     "data": {
       "start": {
         "line": 27,
@@ -88,9 +88,9 @@
     }
   },
   {
-    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF IN GROUP-QUALIF-1)",
+    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF IN GROUP-QUALIF-2)",
     "kind": 6,
-    "insertText": "SAY-GROUP-QUALIF IN GROUP-QUALIF-1",
+    "insertText": "SAY-GROUP-QUALIF IN GROUP-QUALIF-2",
     "data": {
       "start": {
         "line": 27,
@@ -103,9 +103,9 @@
     }
   },
   {
-    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF IN GROUP-QUALIF-2)",
+    "label": "SAY-GROUP1 (Alphanumeric) (SAY-GROUP1)",
     "kind": 6,
-    "insertText": "SAY-GROUP-QUALIF IN GROUP-QUALIF-2",
+    "insertText": "SAY-GROUP1",
     "data": {
       "start": {
         "line": 27,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/String.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/String.txt
index f6f0aa0ce..b794fa1bb 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/String.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/String.txt
@@ -38,9 +38,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Alphanumeric) (SAY-VAR1)",
+    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP1-SAY",
     "data": {
       "start": {
         "line": 22,
@@ -53,9 +53,9 @@
     }
   },
   {
-    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
+    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1-SAY",
+    "insertText": "SAY-FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 22,
@@ -68,9 +68,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (AlphanumericEdited) (GROUP1-SAY::VAR2-SAY)",
+    "label": "SAY-VAR1 (Alphanumeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "GROUP1-SAY::VAR2-SAY",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 22,
@@ -83,9 +83,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Alphabetic) (VAR3-SAY-VAR3)",
+    "label": "VAR2-SAY (AlphanumericEdited) (GROUP1-SAY::VAR2-SAY)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "GROUP1-SAY::VAR2-SAY",
     "data": {
       "start": {
         "line": 22,
@@ -98,9 +98,9 @@
     }
   },
   {
-    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
+    "label": "VAR3-SAY-VAR3 (Alphabetic) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "SAY-FUNCTION-POINTER",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 22,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/Unstring.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/Unstring.txt
index 317a08970..0a5fa2f94 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/Unstring.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterInto/Unstring.txt
@@ -38,9 +38,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Alphanumeric) (SAY_VAR1)",
+    "label": "GROUP1_SAY (Alphanumeric) (GROUP1_SAY)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP1_SAY",
     "data": {
       "start": {
         "line": 22,
@@ -53,9 +53,9 @@
     }
   },
   {
-    "label": "GROUP1_SAY (Alphanumeric) (GROUP1_SAY)",
+    "label": "SAY_FUNCTION-POINTER (Alphanumeric) (SAY_FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1_SAY",
+    "insertText": "SAY_FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 22,
@@ -68,9 +68,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (AlphanumericEdited) (GROUP1_SAY::VAR2_SAY)",
+    "label": "SAY_VAR1 (Alphanumeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "GROUP1_SAY::VAR2_SAY",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 22,
@@ -83,9 +83,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Alphabetic) (VAR3_SAY_VAR3)",
+    "label": "VAR2_SAY (AlphanumericEdited) (GROUP1_SAY::VAR2_SAY)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "GROUP1_SAY::VAR2_SAY",
     "data": {
       "start": {
         "line": 22,
@@ -98,9 +98,9 @@
     }
   },
   {
-    "label": "SAY_FUNCTION-POINTER (Alphanumeric) (SAY_FUNCTION-POINTER)",
+    "label": "VAR3_SAY_VAR3 (Alphabetic) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "SAY_FUNCTION-POINTER",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 22,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingHyphens.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingHyphens.txt
index e6b200432..eadfb89ef 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingHyphens.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingHyphens.txt
@@ -52,9 +52,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
+    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP1-SAY",
     "data": {
       "start": {
         "line": 36,
@@ -82,9 +82,9 @@
     }
   },
   {
-    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
+    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1-SAY",
+    "insertText": "SAY-FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 36,
@@ -97,9 +97,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Alphanumeric) (VAR2-SAY)",
+    "label": "SAY-INDEX (Numeric) (SAY-INDEX)",
     "kind": 6,
-    "insertText": "VAR2-SAY",
+    "insertText": "SAY-INDEX",
     "data": {
       "start": {
         "line": 36,
@@ -112,9 +112,9 @@
     }
   },
   {
-    "label": "SAY66 (?) (SAY66)",
+    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
     "kind": 6,
-    "insertText": "SAY66",
+    "insertText": "SAY-POINTER",
     "data": {
       "start": {
         "line": 36,
@@ -127,9 +127,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
+    "label": "SAY-PROCEDURE-POINTER (Alphanumeric) (SAY-PROCEDURE-POINTER)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "SAY-PROCEDURE-POINTER",
     "data": {
       "start": {
         "line": 36,
@@ -142,9 +142,9 @@
     }
   },
   {
-    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
+    "label": "SAY-VAR-QUALIF (Alphanumeric) (SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-1 OF GROUP-QUALIF-1)",
     "kind": 6,
-    "insertText": "SAY-POINTER",
+    "insertText": "SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-1 OF GROUP-QUALIF-1",
     "data": {
       "start": {
         "line": 36,
@@ -157,9 +157,9 @@
     }
   },
   {
-    "label": "SAY-PROCEDURE-POINTER (Alphanumeric) (SAY-PROCEDURE-POINTER)",
+    "label": "SAY-VAR-QUALIF (Alphanumeric) (SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-2 OF GROUP-QUALIF-2)",
     "kind": 6,
-    "insertText": "SAY-PROCEDURE-POINTER",
+    "insertText": "SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-2 OF GROUP-QUALIF-2",
     "data": {
       "start": {
         "line": 36,
@@ -172,9 +172,9 @@
     }
   },
   {
-    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
+    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "SAY-FUNCTION-POINTER",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 36,
@@ -187,9 +187,9 @@
     }
   },
   {
-    "label": "SAY-INDEX (Numeric) (SAY-INDEX)",
+    "label": "SAY66 (?) (SAY66)",
     "kind": 6,
-    "insertText": "SAY-INDEX",
+    "insertText": "SAY66",
     "data": {
       "start": {
         "line": 36,
@@ -202,9 +202,9 @@
     }
   },
   {
-    "label": "SAY-VAR-QUALIF (Alphanumeric) (SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-1 OF GROUP-QUALIF-1)",
+    "label": "SAY77 (Alphanumeric) (SAY77)",
     "kind": 6,
-    "insertText": "SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-1 OF GROUP-QUALIF-1",
+    "insertText": "SAY77",
     "data": {
       "start": {
         "line": 36,
@@ -217,9 +217,9 @@
     }
   },
   {
-    "label": "SAY-VAR-QUALIF (Alphanumeric) (SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-2 OF GROUP-QUALIF-2)",
+    "label": "VAR2-SAY (Alphanumeric) (VAR2-SAY)",
     "kind": 6,
-    "insertText": "SAY-VAR-QUALIF OF SUB-GROUP-QUALIF-2 OF GROUP-QUALIF-2",
+    "insertText": "VAR2-SAY",
     "data": {
       "start": {
         "line": 36,
@@ -232,9 +232,9 @@
     }
   },
   {
-    "label": "SAY77 (Alphanumeric) (SAY77)",
+    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "SAY77",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 36,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingUnderscores.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingUnderscores.txt
index 0cd03d27e..fbdc2fd37 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingUnderscores.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterMove/NamesUsingUnderscores.txt
@@ -46,9 +46,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "GROUP1_SAY (Alphanumeric) (GROUP1_SAY)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP1_SAY",
     "data": {
       "start": {
         "line": 30,
@@ -76,9 +76,9 @@
     }
   },
   {
-    "label": "GROUP1_SAY (Alphanumeric) (GROUP1_SAY)",
+    "label": "SAY_FUNCTION-POINTER (Alphanumeric) (SAY_FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1_SAY",
+    "insertText": "SAY_FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 30,
@@ -91,9 +91,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Alphanumeric) (GROUP1_SAY::VAR2_SAY)",
+    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
     "kind": 6,
-    "insertText": "GROUP1_SAY::VAR2_SAY",
+    "insertText": "GROUP2::SAY_INDEX",
     "data": {
       "start": {
         "line": 30,
@@ -106,9 +106,9 @@
     }
   },
   {
-    "label": "SAY66 (?) (GROUP1_SAY::SAY66)",
+    "label": "SAY_POINTER (Alphanumeric) (SAY_POINTER)",
     "kind": 6,
-    "insertText": "GROUP1_SAY::SAY66",
+    "insertText": "SAY_POINTER",
     "data": {
       "start": {
         "line": 30,
@@ -121,9 +121,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "SAY_PROCEDURE-POINTER (Alphanumeric) (SAY_PROCEDURE-POINTER)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "SAY_PROCEDURE-POINTER",
     "data": {
       "start": {
         "line": 30,
@@ -136,9 +136,9 @@
     }
   },
   {
-    "label": "SAY_POINTER (Alphanumeric) (SAY_POINTER)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "SAY_POINTER",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 30,
@@ -151,9 +151,9 @@
     }
   },
   {
-    "label": "SAY_PROCEDURE-POINTER (Alphanumeric) (SAY_PROCEDURE-POINTER)",
+    "label": "SAY66 (?) (GROUP1_SAY::SAY66)",
     "kind": 6,
-    "insertText": "SAY_PROCEDURE-POINTER",
+    "insertText": "GROUP1_SAY::SAY66",
     "data": {
       "start": {
         "line": 30,
@@ -166,9 +166,9 @@
     }
   },
   {
-    "label": "SAY_FUNCTION-POINTER (Alphanumeric) (SAY_FUNCTION-POINTER)",
+    "label": "SAY77 (Alphanumeric) (SAY77)",
     "kind": 6,
-    "insertText": "SAY_FUNCTION-POINTER",
+    "insertText": "SAY77",
     "data": {
       "start": {
         "line": 30,
@@ -181,9 +181,9 @@
     }
   },
   {
-    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
+    "label": "VAR2_SAY (Alphanumeric) (GROUP1_SAY::VAR2_SAY)",
     "kind": 6,
-    "insertText": "GROUP2::SAY_INDEX",
+    "insertText": "GROUP1_SAY::VAR2_SAY",
     "data": {
       "start": {
         "line": 30,
@@ -196,9 +196,9 @@
     }
   },
   {
-    "label": "SAY77 (Alphanumeric) (SAY77)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "SAY77",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 30,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Chain2.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Chain2.txt
index 5023cde9f..761915304 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Chain2.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Chain2.txt
@@ -39,9 +39,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-MAIN-GROUP1 (Alphanumeric) (SAY-MAIN-GROUP1)",
+    "label": "SAY-GROUP2 (Alphanumeric) (SAY-GROUP2 OF SAY-MAIN-GROUP2)",
     "kind": 6,
-    "insertText": "SAY-MAIN-GROUP1",
+    "insertText": "SAY-GROUP2 OF SAY-MAIN-GROUP2",
     "data": {
       "start": {
         "line": 31,
@@ -54,9 +54,9 @@
     }
   },
   {
-    "label": "SAY-GROUP2 (Alphanumeric) (SAY-GROUP2 OF SAY-MAIN-GROUP2)",
+    "label": "SAY-GROUP3 (Alphanumeric) (SAY-GROUP3 OF NOT-MAIN-GLOUP)",
     "kind": 6,
-    "insertText": "SAY-GROUP2 OF SAY-MAIN-GROUP2",
+    "insertText": "SAY-GROUP3 OF NOT-MAIN-GLOUP",
     "data": {
       "start": {
         "line": 31,
@@ -69,9 +69,9 @@
     }
   },
   {
-    "label": "SAY-MAIN-GROUP2 (Alphanumeric) (SAY-MAIN-GROUP2)",
+    "label": "SAY-MAIN-GROUP1 (Alphanumeric) (SAY-MAIN-GROUP1)",
     "kind": 6,
-    "insertText": "SAY-MAIN-GROUP2",
+    "insertText": "SAY-MAIN-GROUP1",
     "data": {
       "start": {
         "line": 31,
@@ -84,9 +84,9 @@
     }
   },
   {
-    "label": "SAY-GROUP3 (Alphanumeric) (SAY-GROUP3 OF NOT-MAIN-GLOUP)",
+    "label": "SAY-MAIN-GROUP2 (Alphanumeric) (SAY-MAIN-GROUP2)",
     "kind": 6,
-    "insertText": "SAY-GROUP3 OF NOT-MAIN-GLOUP",
+    "insertText": "SAY-MAIN-GROUP2",
     "data": {
       "start": {
         "line": 31,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/IfAddress.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/IfAddress.txt
index 8695d9368..c5c878585 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/IfAddress.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/IfAddress.txt
@@ -50,9 +50,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "WS-SAY-VAR1 (Numeric) (WS-SAY-VAR1)",
+    "label": "LK-SAY-VAR1 (Numeric) (LK-SAY-VAR1)",
     "kind": 6,
-    "insertText": "WS-SAY-VAR1",
+    "insertText": "LK-SAY-VAR1",
     "data": {
       "start": {
         "line": 34,
@@ -65,9 +65,9 @@
     }
   },
   {
-    "label": "WS-SAY-VAR2 (Numeric) (WS-SAY-VAR2)",
+    "label": "LK-SAY-VAR2 (Numeric) (LK-SAY-VAR2)",
     "kind": 6,
-    "insertText": "WS-SAY-VAR2",
+    "insertText": "LK-SAY-VAR2",
     "data": {
       "start": {
         "line": 34,
@@ -110,9 +110,9 @@
     }
   },
   {
-    "label": "LK-SAY-VAR1 (Numeric) (LK-SAY-VAR1)",
+    "label": "WS-SAY-VAR1 (Numeric) (WS-SAY-VAR1)",
     "kind": 6,
-    "insertText": "LK-SAY-VAR1",
+    "insertText": "WS-SAY-VAR1",
     "data": {
       "start": {
         "line": 34,
@@ -125,9 +125,9 @@
     }
   },
   {
-    "label": "LK-SAY-VAR2 (Numeric) (LK-SAY-VAR2)",
+    "label": "WS-SAY-VAR2 (Numeric) (WS-SAY-VAR2)",
     "kind": 6,
-    "insertText": "LK-SAY-VAR2",
+    "insertText": "WS-SAY-VAR2",
     "data": {
       "start": {
         "line": 34,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/SeveralParents.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/SeveralParents.txt
index 4589c0f85..d56c79e35 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/SeveralParents.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/SeveralParents.txt
@@ -23,9 +23,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SUB-GROUP1 (Alphanumeric) (SUB-GROUP1 OF MAIN-GROUP1)",
+    "label": "MAIN-GROUP1 (Alphanumeric) (MAIN-GROUP1)",
     "kind": 6,
-    "insertText": "SUB-GROUP1 OF MAIN-GROUP1",
+    "insertText": "MAIN-GROUP1",
     "data": {
       "start": {
         "line": 15,
@@ -38,9 +38,9 @@
     }
   },
   {
-    "label": "MAIN-GROUP1 (Alphanumeric) (MAIN-GROUP1)",
+    "label": "MAIN-GROUP2 (Alphanumeric) (MAIN-GROUP2)",
     "kind": 6,
-    "insertText": "MAIN-GROUP1",
+    "insertText": "MAIN-GROUP2",
     "data": {
       "start": {
         "line": 15,
@@ -53,9 +53,9 @@
     }
   },
   {
-    "label": "MAIN-GROUP2 (Alphanumeric) (MAIN-GROUP2)",
+    "label": "SUB-GROUP1 (Alphanumeric) (SUB-GROUP1 OF MAIN-GROUP1)",
     "kind": 6,
-    "insertText": "MAIN-GROUP2",
+    "insertText": "SUB-GROUP1 OF MAIN-GROUP1",
     "data": {
       "start": {
         "line": 15,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Variable.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Variable.txt
index ec7d5450e..18b91aeae 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Variable.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterOf/Variable.txt
@@ -39,9 +39,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-GROUP1 (Alphanumeric) (SAY-GROUP1)",
+    "label": "GROUP2-SAY (Alphanumeric) (GROUP2-SAY)",
     "kind": 6,
-    "insertText": "SAY-GROUP1",
+    "insertText": "GROUP2-SAY",
     "data": {
       "start": {
         "line": 23,
@@ -54,9 +54,9 @@
     }
   },
   {
-    "label": "GROUP2-SAY (Alphanumeric) (GROUP2-SAY)",
+    "label": "GROUP3-SAY-GROUP3 (Alphanumeric) (GROUP3-SAY-GROUP3)",
     "kind": 6,
-    "insertText": "GROUP2-SAY",
+    "insertText": "GROUP3-SAY-GROUP3",
     "data": {
       "start": {
         "line": 23,
@@ -69,9 +69,9 @@
     }
   },
   {
-    "label": "GROUP3-SAY-GROUP3 (Alphanumeric) (GROUP3-SAY-GROUP3)",
+    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF OF GROUP-QUALIF-1)",
     "kind": 6,
-    "insertText": "GROUP3-SAY-GROUP3",
+    "insertText": "SAY-GROUP-QUALIF OF GROUP-QUALIF-1",
     "data": {
       "start": {
         "line": 23,
@@ -84,9 +84,9 @@
     }
   },
   {
-    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF OF GROUP-QUALIF-1)",
+    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF OF GROUP-QUALIF-2)",
     "kind": 6,
-    "insertText": "SAY-GROUP-QUALIF OF GROUP-QUALIF-1",
+    "insertText": "SAY-GROUP-QUALIF OF GROUP-QUALIF-2",
     "data": {
       "start": {
         "line": 23,
@@ -99,9 +99,9 @@
     }
   },
   {
-    "label": "SAY-GROUP-QUALIF (Alphanumeric) (SAY-GROUP-QUALIF OF GROUP-QUALIF-2)",
+    "label": "SAY-GROUP1 (Alphanumeric) (SAY-GROUP1)",
     "kind": 6,
-    "insertText": "SAY-GROUP-QUALIF OF GROUP-QUALIF-2",
+    "insertText": "SAY-GROUP1",
     "data": {
       "start": {
         "line": 23,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingHyphens.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingHyphens.txt
index b6bba2187..a5949a543 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingHyphens.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingHyphens.txt
@@ -48,7 +48,7 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "p1-say-hello",
+    "label": "p1-say-goodbye",
     "kind": 18,
     "data": {
       "start": {
@@ -62,7 +62,7 @@
     }
   },
   {
-    "label": "p2-say-world",
+    "label": "p1-say-hello",
     "kind": 18,
     "data": {
       "start": {
@@ -76,7 +76,7 @@
     }
   },
   {
-    "label": "p1-say-goodbye",
+    "label": "p2-say-end",
     "kind": 18,
     "data": {
       "start": {
@@ -90,7 +90,7 @@
     }
   },
   {
-    "label": "p2-say-end",
+    "label": "p2-say-world",
     "kind": 18,
     "data": {
       "start": {
@@ -160,7 +160,7 @@
     }
   },
   {
-    "label": "say-var1 PIC9",
+    "label": "say-var1 PIC 9",
     "kind": 6,
     "insertText": "say-var1",
     "data": {
@@ -175,7 +175,7 @@
     }
   },
   {
-    "label": "var2-say PIC9",
+    "label": "var2-say PIC 9",
     "kind": 6,
     "insertText": "var2-say",
     "data": {
@@ -190,7 +190,7 @@
     }
   },
   {
-    "label": "var3-say-var3 PIC9",
+    "label": "var3-say-var3 PIC 9",
     "kind": 6,
     "insertText": "var3-say-var3",
     "data": {
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingUnderscores.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingUnderscores.txt
index 10e628181..4bf886373 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingUnderscores.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterPerform/NamesUsingUnderscores.txt
@@ -48,7 +48,7 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "p1_say_hello",
+    "label": "p1_say_goodbye",
     "kind": 18,
     "data": {
       "start": {
@@ -62,7 +62,7 @@
     }
   },
   {
-    "label": "p2_say_world",
+    "label": "p1_say_hello",
     "kind": 18,
     "data": {
       "start": {
@@ -76,7 +76,7 @@
     }
   },
   {
-    "label": "p1_say_goodbye",
+    "label": "p2_say_end",
     "kind": 18,
     "data": {
       "start": {
@@ -90,7 +90,7 @@
     }
   },
   {
-    "label": "p2_say_end",
+    "label": "p2_say_world",
     "kind": 18,
     "data": {
       "start": {
@@ -160,7 +160,7 @@
     }
   },
   {
-    "label": "say_var1 PIC9",
+    "label": "say_var1 PIC 9",
     "kind": 6,
     "insertText": "say_var1",
     "data": {
@@ -175,7 +175,7 @@
     }
   },
   {
-    "label": "var2_say PIC9",
+    "label": "var2_say PIC 9",
     "kind": 6,
     "insertText": "var2_say",
     "data": {
@@ -190,7 +190,7 @@
     }
   },
   {
-    "label": "var3_say_var3 PIC9",
+    "label": "var3_say_var3 PIC 9",
     "kind": 6,
     "insertText": "var3_say_var3",
     "data": {
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingHyphens.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingHyphens.txt
index 73729de3d..64d925d78 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingHyphens.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingHyphens.txt
@@ -40,9 +40,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
+    "label": "SAY-INDEX (Numeric) (GROUP2::SAY-INDEX)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP2::SAY-INDEX",
     "data": {
       "start": {
         "line": 24,
@@ -55,9 +55,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Numeric) (GROUP1::VAR2-SAY)",
+    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2-SAY",
+    "insertText": "SAY-POINTER",
     "data": {
       "start": {
         "line": 24,
@@ -70,9 +70,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
+    "label": "SAY-POINTER-32 (Alphanumeric) (SAY-POINTER-32)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "SAY-POINTER-32",
     "data": {
       "start": {
         "line": 24,
@@ -85,9 +85,9 @@
     }
   },
   {
-    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
+    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "SAY-POINTER",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 24,
@@ -100,9 +100,9 @@
     }
   },
   {
-    "label": "SAY-POINTER-32 (Alphanumeric) (SAY-POINTER-32)",
+    "label": "SAY88-NO (Level88) (GROUP2::VAR4::SAY88-NO)",
     "kind": 6,
-    "insertText": "SAY-POINTER-32",
+    "insertText": "GROUP2::VAR4::SAY88-NO",
     "data": {
       "start": {
         "line": 24,
@@ -130,9 +130,9 @@
     }
   },
   {
-    "label": "SAY88-NO (Level88) (GROUP2::VAR4::SAY88-NO)",
+    "label": "VAR2-SAY (Numeric) (GROUP1::VAR2-SAY)",
     "kind": 6,
-    "insertText": "GROUP2::VAR4::SAY88-NO",
+    "insertText": "GROUP1::VAR2-SAY",
     "data": {
       "start": {
         "line": 24,
@@ -145,9 +145,9 @@
     }
   },
   {
-    "label": "SAY-INDEX (Numeric) (GROUP2::SAY-INDEX)",
+    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY-INDEX",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 24,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingUnderscores.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingUnderscores.txt
index 74ee0c23f..ffe193080 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingUnderscores.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterSet/NamesUsingUnderscores.txt
@@ -40,9 +40,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP2::SAY_INDEX",
     "data": {
       "start": {
         "line": 24,
@@ -55,9 +55,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
+    "label": "SAY_POINTER (Alphanumeric) (SAY_POINTER)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2_SAY",
+    "insertText": "SAY_POINTER",
     "data": {
       "start": {
         "line": 24,
@@ -70,9 +70,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "SAY_POINTER-32 (Alphanumeric) (SAY_POINTER-32)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "SAY_POINTER-32",
     "data": {
       "start": {
         "line": 24,
@@ -85,9 +85,9 @@
     }
   },
   {
-    "label": "SAY_POINTER (Alphanumeric) (SAY_POINTER)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "SAY_POINTER",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 24,
@@ -100,9 +100,9 @@
     }
   },
   {
-    "label": "SAY_POINTER-32 (Alphanumeric) (SAY_POINTER-32)",
+    "label": "SAY88-NO (Level88) (GROUP2::VAR4::SAY88-NO)",
     "kind": 6,
-    "insertText": "SAY_POINTER-32",
+    "insertText": "GROUP2::VAR4::SAY88-NO",
     "data": {
       "start": {
         "line": 24,
@@ -130,9 +130,9 @@
     }
   },
   {
-    "label": "SAY88-NO (Level88) (GROUP2::VAR4::SAY88-NO)",
+    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
     "kind": 6,
-    "insertText": "GROUP2::VAR4::SAY88-NO",
+    "insertText": "GROUP1::VAR2_SAY",
     "data": {
       "start": {
         "line": 24,
@@ -145,9 +145,9 @@
     }
   },
   {
-    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY_INDEX",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 24,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddLiteral.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddLiteral.txt
index 8bf6eecd6..e5e5db8ff 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddLiteral.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddLiteral.txt
@@ -43,9 +43,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
+    "label": "GROUP2-SAY (Alphanumeric) (GROUP2-SAY)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP2-SAY",
     "data": {
       "start": {
         "line": 27,
@@ -58,9 +58,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Numeric) (VAR2-SAY)",
+    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "VAR2-SAY",
+    "insertText": "SAY-FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 27,
@@ -73,9 +73,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
+    "label": "SAY-INDEX (Numeric) (GROUP1::SAY-INDEX)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "GROUP1::SAY-INDEX",
     "data": {
       "start": {
         "line": 27,
@@ -118,9 +118,9 @@
     }
   },
   {
-    "label": "VAR4-SAY (Alphanumeric) (VAR4-SAY)",
+    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "VAR4-SAY",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 27,
@@ -133,9 +133,9 @@
     }
   },
   {
-    "label": "SAY-INDEX (Numeric) (GROUP1::SAY-INDEX)",
+    "label": "VAR2-SAY (Numeric) (VAR2-SAY)",
     "kind": 6,
-    "insertText": "GROUP1::SAY-INDEX",
+    "insertText": "VAR2-SAY",
     "data": {
       "start": {
         "line": 27,
@@ -148,9 +148,9 @@
     }
   },
   {
-    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
+    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "SAY-FUNCTION-POINTER",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 27,
@@ -163,9 +163,9 @@
     }
   },
   {
-    "label": "VAR5-SAY (Alphanumeric) (VAR5-SAY)",
+    "label": "VAR4-SAY (Alphanumeric) (VAR4-SAY)",
     "kind": 6,
-    "insertText": "VAR5-SAY",
+    "insertText": "VAR4-SAY",
     "data": {
       "start": {
         "line": 27,
@@ -178,9 +178,9 @@
     }
   },
   {
-    "label": "GROUP2-SAY (Alphanumeric) (GROUP2-SAY)",
+    "label": "VAR5-SAY (Alphanumeric) (VAR5-SAY)",
     "kind": 6,
-    "insertText": "GROUP2-SAY",
+    "insertText": "VAR5-SAY",
     "data": {
       "start": {
         "line": 27,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddVariable.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddVariable.txt
index a25f43edf..30c5e2391 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddVariable.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/AddVariable.txt
@@ -42,9 +42,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP2::SAY_INDEX",
     "data": {
       "start": {
         "line": 26,
@@ -57,9 +57,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2_SAY",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 26,
@@ -72,9 +72,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "GROUP1::VAR2_SAY",
     "data": {
       "start": {
         "line": 26,
@@ -87,9 +87,9 @@
     }
   },
   {
-    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY_INDEX",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 26,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Inspect.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Inspect.txt
index bb9e15df8..15ca4545e 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Inspect.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Inspect.txt
@@ -42,9 +42,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP2::SAY_INDEX",
     "data": {
       "start": {
         "line": 26,
@@ -57,9 +57,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2_SAY",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 26,
@@ -72,9 +72,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "GROUP1::VAR2_SAY",
     "data": {
       "start": {
         "line": 26,
@@ -87,9 +87,9 @@
     }
   },
   {
-    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY_INDEX",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 26,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveLiteral.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveLiteral.txt
index 9643d9fdb..4ebfce230 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveLiteral.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveLiteral.txt
@@ -41,9 +41,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
+    "label": "SAY-INDEX (Numeric) (GROUP2::SAY-INDEX)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP2::SAY-INDEX",
     "data": {
       "start": {
         "line": 25,
@@ -56,9 +56,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Numeric) (GROUP1::VAR2-SAY)",
+    "label": "SAY-VAR1 (Numeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2-SAY",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 25,
@@ -71,9 +71,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
+    "label": "VAR2-SAY (Numeric) (GROUP1::VAR2-SAY)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "GROUP1::VAR2-SAY",
     "data": {
       "start": {
         "line": 25,
@@ -86,9 +86,9 @@
     }
   },
   {
-    "label": "SAY-INDEX (Numeric) (GROUP2::SAY-INDEX)",
+    "label": "VAR3-SAY-VAR3 (Numeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY-INDEX",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 25,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveSpaces.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveSpaces.txt
index d977e3fd2..6588780dc 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveSpaces.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveSpaces.txt
@@ -41,9 +41,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY-VAR1 (Alphanumeric) (SAY-VAR1)",
+    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP1-SAY",
     "data": {
       "start": {
         "line": 25,
@@ -56,9 +56,9 @@
     }
   },
   {
-    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
+    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1-SAY",
+    "insertText": "SAY-FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 25,
@@ -71,9 +71,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Alphanumeric) (VAR3-SAY-VAR3)",
+    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "SAY-POINTER",
     "data": {
       "start": {
         "line": 25,
@@ -86,9 +86,9 @@
     }
   },
   {
-    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
+    "label": "SAY-VAR1 (Alphanumeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "SAY-FUNCTION-POINTER",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 25,
@@ -101,9 +101,9 @@
     }
   },
   {
-    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
+    "label": "VAR2-SAY (Alphabetic) (GROUP1-SAY::VAR2-SAY)",
     "kind": 6,
-    "insertText": "SAY-POINTER",
+    "insertText": "GROUP1-SAY::VAR2-SAY",
     "data": {
       "start": {
         "line": 25,
@@ -116,9 +116,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Alphabetic) (GROUP1-SAY::VAR2-SAY)",
+    "label": "VAR3-SAY-VAR3 (Alphanumeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "GROUP1-SAY::VAR2-SAY",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 25,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveVariable.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveVariable.txt
index 1137de744..4f205939d 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveVariable.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveVariable.txt
@@ -42,9 +42,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP2::SAY_INDEX",
     "data": {
       "start": {
         "line": 26,
@@ -57,9 +57,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2_SAY",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 26,
@@ -72,9 +72,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "GROUP1::VAR2_SAY",
     "data": {
       "start": {
         "line": 26,
@@ -87,9 +87,9 @@
     }
   },
   {
-    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY_INDEX",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 26,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveZero.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveZero.txt
index 78e16775b..070417d25 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveZero.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/MoveZero.txt
@@ -41,9 +41,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "VAR4-SAY (Numeric) (VAR4-SAY)",
+    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
     "kind": 6,
-    "insertText": "VAR4-SAY",
+    "insertText": "GROUP1-SAY",
     "data": {
       "start": {
         "line": 25,
@@ -56,9 +56,9 @@
     }
   },
   {
-    "label": "SAY-INDEX (Numeric) (GROUP2::SAY-INDEX)",
+    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
     "kind": 6,
-    "insertText": "GROUP2::SAY-INDEX",
+    "insertText": "SAY-FUNCTION-POINTER",
     "data": {
       "start": {
         "line": 25,
@@ -71,9 +71,9 @@
     }
   },
   {
-    "label": "SAY-VAR1 (Alphanumeric) (SAY-VAR1)",
+    "label": "SAY-INDEX (Numeric) (GROUP2::SAY-INDEX)",
     "kind": 6,
-    "insertText": "SAY-VAR1",
+    "insertText": "GROUP2::SAY-INDEX",
     "data": {
       "start": {
         "line": 25,
@@ -86,9 +86,9 @@
     }
   },
   {
-    "label": "GROUP1-SAY (Alphanumeric) (GROUP1-SAY)",
+    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
     "kind": 6,
-    "insertText": "GROUP1-SAY",
+    "insertText": "SAY-POINTER",
     "data": {
       "start": {
         "line": 25,
@@ -101,9 +101,9 @@
     }
   },
   {
-    "label": "VAR3-SAY-VAR3 (Alphanumeric) (VAR3-SAY-VAR3)",
+    "label": "SAY-VAR1 (Alphanumeric) (SAY-VAR1)",
     "kind": 6,
-    "insertText": "VAR3-SAY-VAR3",
+    "insertText": "SAY-VAR1",
     "data": {
       "start": {
         "line": 25,
@@ -116,9 +116,9 @@
     }
   },
   {
-    "label": "SAY-FUNCTION-POINTER (Alphanumeric) (SAY-FUNCTION-POINTER)",
+    "label": "VAR2-SAY (Alphabetic) (GROUP1-SAY::VAR2-SAY)",
     "kind": 6,
-    "insertText": "SAY-FUNCTION-POINTER",
+    "insertText": "GROUP1-SAY::VAR2-SAY",
     "data": {
       "start": {
         "line": 25,
@@ -131,9 +131,9 @@
     }
   },
   {
-    "label": "SAY-POINTER (Alphanumeric) (SAY-POINTER)",
+    "label": "VAR3-SAY-VAR3 (Alphanumeric) (VAR3-SAY-VAR3)",
     "kind": 6,
-    "insertText": "SAY-POINTER",
+    "insertText": "VAR3-SAY-VAR3",
     "data": {
       "start": {
         "line": 25,
@@ -146,9 +146,9 @@
     }
   },
   {
-    "label": "VAR2-SAY (Alphabetic) (GROUP1-SAY::VAR2-SAY)",
+    "label": "VAR4-SAY (Numeric) (VAR4-SAY)",
     "kind": 6,
-    "insertText": "GROUP1-SAY::VAR2-SAY",
+    "insertText": "VAR4-SAY",
     "data": {
       "start": {
         "line": 25,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Set.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Set.txt
index 767c9297b..3e3125f14 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Set.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/Set.txt
@@ -42,9 +42,9 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
+    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
     "kind": 6,
-    "insertText": "SAY_VAR1",
+    "insertText": "GROUP2::SAY_INDEX",
     "data": {
       "start": {
         "line": 26,
@@ -57,9 +57,9 @@
     }
   },
   {
-    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
+    "label": "SAY_VAR1 (Numeric) (SAY_VAR1)",
     "kind": 6,
-    "insertText": "GROUP1::VAR2_SAY",
+    "insertText": "SAY_VAR1",
     "data": {
       "start": {
         "line": 26,
@@ -72,9 +72,9 @@
     }
   },
   {
-    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
+    "label": "VAR2_SAY (Numeric) (GROUP1::VAR2_SAY)",
     "kind": 6,
-    "insertText": "VAR3_SAY_VAR3",
+    "insertText": "GROUP1::VAR2_SAY",
     "data": {
       "start": {
         "line": 26,
@@ -87,9 +87,9 @@
     }
   },
   {
-    "label": "SAY_INDEX (Numeric) (GROUP2::SAY_INDEX)",
+    "label": "VAR3_SAY_VAR3 (Numeric) (VAR3_SAY_VAR3)",
     "kind": 6,
-    "insertText": "GROUP2::SAY_INDEX",
+    "insertText": "VAR3_SAY_VAR3",
     "data": {
       "start": {
         "line": 26,
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetNothingAfterTo.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetNothingAfterTo.txt
index 52d3df791..74bc5ebd9 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetNothingAfterTo.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetNothingAfterTo.txt
@@ -39,6 +39,11 @@
 {"line":24,"character":25}
 ---------------------------------------------------------------------------------
 [
+  {
+    "label": "VAR_INDEX (Numeric) (GROUP2::VAR_INDEX)",
+    "kind": 6,
+    "insertText": "GROUP2::VAR_INDEX"
+  },
   {
     "label": "VAR1 (Numeric) (VAR1)",
     "kind": 6,
@@ -53,10 +58,5 @@
     "label": "VAR3 (Numeric) (VAR3)",
     "kind": 6,
     "insertText": "VAR3"
-  },
-  {
-    "label": "VAR_INDEX (Numeric) (GROUP2::VAR_INDEX)",
-    "kind": 6,
-    "insertText": "GROUP2::VAR_INDEX"
   }
 ]
\ No newline at end of file
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetOf.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetOf.txt
index 6c251c7d3..31e5ebf2c 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetOf.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterTo/SetOf.txt
@@ -42,6 +42,11 @@
 {"line":27,"character":35}
 ---------------------------------------------------------------------------------
 [
+  {
+    "label": "VAR_INDEX (Numeric) (GROUP2::VAR_INDEX)",
+    "kind": 6,
+    "insertText": "GROUP2::VAR_INDEX"
+  },
   {
     "label": "VAR1 (Numeric) (VAR1)",
     "kind": 6,
@@ -56,10 +61,5 @@
     "label": "VAR3 (Numeric) (VAR3)",
     "kind": 6,
     "insertText": "VAR3"
-  },
-  {
-    "label": "VAR_INDEX (Numeric) (GROUP2::VAR_INDEX)",
-    "kind": 6,
-    "insertText": "GROUP2::VAR_INDEX"
   }
 ]
\ No newline at end of file
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterUnsupportedKeyword/WithoutUserFilter.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterUnsupportedKeyword/WithoutUserFilter.txt
index 14aa828d7..a1b66e72e 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterUnsupportedKeyword/WithoutUserFilter.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AfterUnsupportedKeyword/WithoutUserFilter.txt
@@ -22,43 +22,43 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "var1 (Alphanumeric) (var1)",
+    "label": "group1 (Alphanumeric) (group1)",
     "kind": 6,
-    "insertText": "var1"
+    "insertText": "group1"
   },
   {
-    "label": "other-data (Alphanumeric) (other-data)",
+    "label": "group2 (Alphanumeric) (group1::group2)",
     "kind": 6,
-    "insertText": "other-data"
+    "insertText": "group1::group2"
   },
   {
-    "label": "var2 (Numeric) (var2)",
+    "label": "not-suggested (Alphanumeric) (not-suggested)",
     "kind": 6,
-    "insertText": "var2"
+    "insertText": "not-suggested"
   },
   {
-    "label": "group1 (Alphanumeric) (group1)",
+    "label": "other-data (Alphanumeric) (other-data)",
     "kind": 6,
-    "insertText": "group1"
+    "insertText": "other-data"
   },
   {
-    "label": "var3 (Alphanumeric) (group1::var3)",
+    "label": "var1 (Alphanumeric) (var1)",
     "kind": 6,
-    "insertText": "group1::var3"
+    "insertText": "var1"
   },
   {
-    "label": "group2 (Alphanumeric) (group1::group2)",
+    "label": "var2 (Numeric) (var2)",
     "kind": 6,
-    "insertText": "group1::group2"
+    "insertText": "var2"
   },
   {
-    "label": "var4 (Numeric) (group1::group2::var4)",
+    "label": "var3 (Alphanumeric) (group1::var3)",
     "kind": 6,
-    "insertText": "group1::group2::var4"
+    "insertText": "group1::var3"
   },
   {
-    "label": "not-suggested (Alphanumeric) (not-suggested)",
+    "label": "var4 (Numeric) (group1::group2::var4)",
     "kind": 6,
-    "insertText": "not-suggested"
+    "insertText": "group1::group2::var4"
   }
 ]
\ No newline at end of file
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AtBeginningOfLine/KeywordNoUserFilter.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AtBeginningOfLine/KeywordNoUserFilter.txt
index ca25d9e5a..b3b6191b8 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AtBeginningOfLine/KeywordNoUserFilter.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/AtBeginningOfLine/KeywordNoUserFilter.txt
@@ -183,11 +183,11 @@
     "kind": 14
   },
   {
-    "label": "GOBACK ",
+    "label": "GO ",
     "kind": 14
   },
   {
-    "label": "GO ",
+    "label": "GOBACK ",
     "kind": 14
   },
   {
diff --git a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/CompletionAfterUserDefinedWord.txt b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/CompletionAfterUserDefinedWord.txt
index 5ddecf813..49f59b8ff 100644
--- a/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/CompletionAfterUserDefinedWord.txt
+++ b/TypeCobol.LanguageServer.Test/ProcessorTests/Completion/CompletionAfterUserDefinedWord.txt
@@ -15,14 +15,14 @@
 ---------------------------------------------------------------------------------
 [
   {
-    "label": "var1 (Alphanumeric) (var1)",
+    "label": "other-data (Alphanumeric) (other-data)",
     "kind": 6,
-    "insertText": "var1"
+    "insertText": "other-data"
   },
   {
-    "label": "other-data (Alphanumeric) (other-data)",
+    "label": "var1 (Alphanumeric) (var1)",
     "kind": 6,
-    "insertText": "other-data"
+    "insertText": "var1"
   },
   {
     "label": "var2 (Numeric) (var2)",
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionAfterPerform.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionAfterPerform.cs
index a5f97af26..252b46d57 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionAfterPerform.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionAfterPerform.cs	
@@ -1,4 +1,5 @@
-using TypeCobol.Compiler;
+using System.Diagnostics;
+using TypeCobol.Compiler;
 using TypeCobol.Compiler.CodeElements;
 using TypeCobol.Compiler.CodeModel;
 using TypeCobol.Compiler.Nodes;
@@ -15,13 +16,12 @@ public CompletionAfterPerform(Token userFilterToken)
 
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
             var performNode = GetMatchingNode(compilationUnit, codeElement);
             IEnumerable<Paragraph> paragraphs = null;
             IEnumerable<Section> sections = null;
             IEnumerable<DataDefinition> variables = null;
-            var completionItems = new List<CompletionItem>();
 
             if (performNode?.SymbolTable != null)
             {
@@ -32,29 +32,29 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
 
             if (paragraphs != null)
             {
-                completionItems.AddRange(paragraphs.Select(para => new CompletionItem() { label = para.Name, kind = CompletionItemKind.Reference }));
+                yield return paragraphs.Select(para => new CompletionItem() { label = para.Name, kind = CompletionItemKind.Reference });
             }
 
             if (sections != null)
             {
-                completionItems.AddRange(sections.Select(s => new CompletionItem() { label = s.Name, kind = CompletionItemKind.Reference }));
+                yield return sections.Select(s => new CompletionItem() { label = s.Name, kind = CompletionItemKind.Reference });
             }
 
             if (variables != null)
             {
-                foreach (var variable in variables)
-                {
-                    var completionItem = new CompletionItem
-                    {
-                        label = $"{variable.Name} PIC{variable.Picture.NormalizedValue}",
-                        insertText = variable.Name,
-                        kind = CompletionItemKind.Variable
-                    };
-                    completionItems.Add(completionItem);
-                }
+                yield return variables.Select(ToCompletionItem);
             }
 
-            return completionItems;
+            static CompletionItem ToCompletionItem(DataDefinition numericVariable)
+            {
+                Debug.Assert(numericVariable.Picture != null);
+                return new CompletionItem
+                {
+                    label = $"{numericVariable.Name} PIC {numericVariable.Picture.NormalizedValue}",
+                    insertText = numericVariable.Name,
+                    kind = CompletionItemKind.Variable
+                };
+            }
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionContext.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionContext.cs
index aa4f5ab1d..f4242ec73 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionContext.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionContext.cs	
@@ -62,6 +62,44 @@ protected bool MatchesWithUserFilter(Node symbol)
             return Regex.IsMatch(symbolName, $"(^{userFilterText})|((-|_){userFilterText})", RegexOptions.IgnoreCase);
         }
 
-        public abstract List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement);
+        public List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        {
+            var result = new List<CompletionItem>();
+            var proposalGroups = ComputeProposalGroups(compilationUnit, codeElement);
+
+            // Flatten proposal groups
+            foreach (var proposalGroup in proposalGroups)
+            {
+                foreach (var completionItem in proposalGroup.OrderBy(item => item.label)) // Order proposals alphabetically in each group
+                {
+                    if (UserFilterToken != null)
+                    {
+                        //Add the range object to let the client know the position of the user filter token
+                        var range = VsCodeProtocol.Range.FromPositions(UserFilterToken.Line - 1, UserFilterToken.StartIndex, UserFilterToken.Line - 1, UserFilterToken.StopIndex + 1);
+
+                        //-1 on line to 0 based / +1 on stop index to include the last character
+                        if (completionItem.data is object[] array)
+                            array[0] = range;
+                        else
+                            completionItem.data = range;
+                    }
+
+                    result.Add(completionItem);
+                }
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Compute proposals grouped by logical categories. Using groups allows to order proposals over two dimensions:
+        /// - First: order of computed groups is preserved allowing the implementors to prioritize certain kinds over some other
+        ///   (i.e. after PERFORM, paragraphs are more often used than sections or numeric variables)
+        /// - order of proposals within each group: we use alphabetical order to help user find data quickly
+        /// </summary>
+        /// <param name="compilationUnit">The current compilation unit being edited.</param>
+        /// <param name="codeElement">The code element on which completion has been requested.</param>
+        /// <returns>Non-null, potentially deferred, of groups of proposals.</returns>
+        protected abstract IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement);
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForInOrOf.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForInOrOf.cs
index cf8b57528..c89237991 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForInOrOf.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForInOrOf.cs	
@@ -69,13 +69,12 @@ public CompletionForInOrOf(Token userFilterToken, Position position, TokenType l
             _lastSignificantTokenType = lastSignificantTokenType;
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
-            var completionItems = new List<CompletionItem>();
             var arrangedCodeElement = codeElement as CodeElementWrapper;
             var node = GetMatchingNode(compilationUnit, codeElement);
             if (node == null)
-                return completionItems;
+                return [];
 
             var tokensUntilCursor = arrangedCodeElement?.ArrangedConsumedTokens
                 .Except(new List<Token>() { UserFilterToken })
@@ -89,25 +88,24 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
             switch (tokenBefore?.TokenType) // In the future, this will allow to switch between different token declared before IN/OF
             {
                 case TokenType.UserDefinedWord:
-                    {
-                        // IN/OF is used to qualify a variable => retrieve the first variable in the IN/OF chain
-                        var tokenFirstVariable = tokensUntilCursor.TakeWhile(t => t.TokenType is TokenType.UserDefinedWord or TokenType.IN or TokenType.OF).LastOrDefault();
-                        completionItems = GetCompletionForParent(node, tokenBefore, tokenFirstVariable, compilationUnit.CompilerOptions);
-                        break;
-                    }
+                {
+                    // IN/OF is used to qualify a variable => retrieve the first variable in the IN/OF chain
+                    var tokenFirstVariable = tokensUntilCursor.TakeWhile(t => t.TokenType is TokenType.UserDefinedWord or TokenType.IN or TokenType.OF).LastOrDefault();
+                    return [ GetCompletionForParent(node, tokenBefore, tokenFirstVariable, compilationUnit.CompilerOptions) ];
+                }
                 case TokenType.ADDRESS:
+                {
+                    if (_lastSignificantTokenType == TokenType.OF)
                     {
-                        if (_lastSignificantTokenType == TokenType.OF)
-                        {
-                            // Manage specifically ADDRESS OF
-                            var contextToken = tokensUntilCursor.Skip(2).FirstOrDefault(); // Try to get the token that may define the completion context
-                            completionItems = GetCompletionForAddressOf(node, contextToken, compilationUnit.CompilerOptions);
-                        }
-                        break;
+                        // Manage specifically ADDRESS OF
+                        var contextToken = tokensUntilCursor.Skip(2).FirstOrDefault(); // Try to get the token that may define the completion context
+                        return [ GetCompletionForAddressOf(node, contextToken, compilationUnit.CompilerOptions) ];
                     }
+                    break;
+                }
             }
 
-            return completionItems;
+            return [];
         }
 
         /// <summary>
@@ -117,7 +115,6 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
         /// </summary>
         /// <param name="node">Node found on cursor position</param>
         /// <param name="contextToken">ContextToken to select if it's a SET or something else</param>
-        /// <param name="userFilterText">Variable Name Filter</param>
         /// <param name="options">Current TypeCobolOptions</param>
         private List<CompletionItem> GetCompletionForAddressOf(Node node, Token contextToken, TypeCobolOptions options)
         {
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForKeywords.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForKeywords.cs
index 358284217..63eacecb0 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForKeywords.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForKeywords.cs	
@@ -132,13 +132,12 @@ public CompletionForKeywords(Token userFilterToken)
 
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
-            return _KeywordSuggestions
+            return [ _KeywordSuggestions
                 .Where(suggestion => suggestion.Key.StartsWith(UserFilterText, StringComparison.OrdinalIgnoreCase))
                 .SelectMany(suggestion => suggestion.Value)
-                .Select(suggestionText => new CompletionItem() { label = suggestionText, kind = CompletionItemKind.Keyword })
-                .ToList();
+                .Select(suggestionText => new CompletionItem() { label = suggestionText, kind = CompletionItemKind.Keyword }) ];
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForLibrary.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForLibrary.cs
index 7fe3b26e9..07c7fd6fb 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForLibrary.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForLibrary.cs	
@@ -14,16 +14,16 @@ public CompletionForLibrary(Token userFilterToken)
 
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
             var callNode = GetMatchingNode(compilationUnit, codeElement);
             if (callNode?.SymbolTable == null)
             {
-                return new List<CompletionItem>();
+                return [];
             }
 
             IEnumerable<Program> programs = callNode.SymbolTable.GetPrograms(StartsWithUserFilter);
-            return programs.Select(prog => new CompletionItem() { label = prog.Name, kind = CompletionItemKind.Module }).ToList();
+            return [ programs.Select(prog => new CompletionItem() { label = prog.Name, kind = CompletionItemKind.Module }) ];
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedure.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedure.cs
index 792dd80a4..708452828 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedure.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedure.cs	
@@ -17,44 +17,32 @@ public CompletionForProcedure(Token userFilterToken, Dictionary<SignatureInforma
             _functionDeclarationSignatureDictionary = functionDeclarationSignatureDictionary;
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
-            IEnumerable<FunctionDeclaration> procedures = null;
-            IEnumerable<DataDefinition> variables;
-            var completionItems = new List<CompletionItem>();
             var node = GetMatchingNode(compilationUnit, codeElement);
-            if (node == null)
-                return completionItems;
+            if (node?.SymbolTable == null)
+                yield break;
 
-            if (node.SymbolTable != null)
-            {
-                procedures = node.SymbolTable.GetFunctions(StartsWithUserFilter, SymbolTable.Scope.Intrinsic);
+            var procedures = node.SymbolTable.GetFunctions(StartsWithUserFilter, SymbolTable.Scope.Intrinsic);
 #if EUROINFO_RULES
-                // No dynamic CALL => do not propose variables
-                variables = [];
+            // No dynamic CALL => do not propose variables
+            var variables = Enumerable.Empty<DataDefinition>();
 #else
-                variables = node.SymbolTable.GetVariables(da => MatchesWithUserFilter(da) && da.Picture != null && da.DataType == DataType.Alphanumeric, SymbolTable.Scope.Program);
+            var variables = node.SymbolTable.GetVariables(da => MatchesWithUserFilter(da) && da.Picture != null && da.DataType == DataType.Alphanumeric, SymbolTable.Scope.Program);
 #endif
-            }
-            else
-            {
-                variables = [];
-            }
 
-            completionItems.AddRange(CompletionFactoryHelpers.CreateCompletionItemsForProcedures(procedures, node, _functionDeclarationSignatureDictionary));
+            yield return CompletionFactoryHelpers.CreateCompletionItemsForProcedures(procedures, node, _functionDeclarationSignatureDictionary);
+            yield return variables.Select(ToCompletionItem);
 
-            foreach (var variable in variables)
+            static CompletionItem ToCompletionItem(DataDefinition variable)
             {
-                var completionItem = new CompletionItem
+                return new CompletionItem
                 {
                     label = variable.Name,
                     insertText = variable.Name,
                     kind = CompletionItemKind.Variable
                 };
-                completionItems.Add(completionItem);
             }
-
-            return completionItems;
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedureParameter.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedureParameter.cs
index 642c856b5..240182822 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedureParameter.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForProcedureParameter.cs	
@@ -36,17 +36,16 @@ public CompletionForProcedureParameter(Token userFilterToken, Token parameterPas
             _procedureSignatureContext = procedureSignatureContext;
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
-            var completionItems = new List<CompletionItem>();
             var arrangedCodeElement = codeElement as CodeElementWrapper;
             var node = GetMatchingNode(compilationUnit, codeElement);
             if (node == null)
-                return completionItems;
+                return [];
 
             //Get procedure name or qualified name
             string procedureName = CompletionFactoryHelpers.GetProcedureNameFromTokens(arrangedCodeElement?.ArrangedConsumedTokens);
-            IEnumerable<FunctionDeclaration> calledProcedures = null;
+            IEnumerable<FunctionDeclaration> calledProcedures;
 
             if (_procedureSignatureContext == null ||
                 !(_procedureSignatureContext.QualifiedName.ToString().Equals(procedureName, StringComparison.OrdinalIgnoreCase)
@@ -85,7 +84,6 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
                     previousTokenType = givenToken.TokenType;
                 }
 
-
             ISet<DataDefinition> potentialVariablesForCompletion = null;
             int maxInput = -1;
 
@@ -161,15 +159,14 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
 
             }
 
-            if (potentialVariablesForCompletion == null) return completionItems;
+            if (potentialVariablesForCompletion == null) return [];
 
             //Convert potential variables into actual CompletionItems
             var variables = potentialVariablesForCompletion
                 .Where(MatchesWithUserFilter) //Filter on user text
                 .Distinct()
                 .SelectMany(d => node.SymbolTable.GetVariablesExplicitWithQualifiedName(new URI(d.Name)));
-            var items = CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions);
-            completionItems.AddRange(items);
+            var completionItems = CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions);
 
             Token callToken = codeElement.ConsumedTokens.First(t => t.TokenType == TokenType.CALL);
             Dictionary<ParameterDescription.PassingTypes, string> paramWithCase = CompletionFactoryHelpers.GetParamsUsingMatchingCase(callToken);
@@ -230,7 +227,7 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
                 }
             }
 
-            return completionItems;
+            return [ completionItems ];
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForQualifiedName.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForQualifiedName.cs
index 33028b8e8..1df3be4d1 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForQualifiedName.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForQualifiedName.cs	
@@ -52,13 +52,12 @@ public CompletionForQualifiedName(Token userFilterToken, Token qualifiedNameSepa
             _functionDeclarationSignatureDictionary = functionDeclarationSignatureDictionary;
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
-            var completionItems = new List<CompletionItem>();
             var arrangedCodeElement = codeElement as CodeElementWrapper;
             var node = GetMatchingNode(compilationUnit, codeElement);
             if (node == null)
-                return completionItems;
+                yield break;
 
             //Get the token before MatchingToken 
             var userTokenToSeek =
@@ -178,8 +177,7 @@ void FilterByUserText(List<Node> nodes)
                 }
 
                 var variables = childrenCandidates.Select(v => new KeyValuePair<DataDefinitionPath, DataDefinition>(null, v));
-                var items = CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions, true);
-                completionItems.AddRange(items);
+                var variableItems = CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions, true);
 
                 if (firstSignificantToken != null)
                 {
@@ -189,13 +187,12 @@ void FilterByUserText(List<Node> nodes)
                         case TokenType.CALL:
                             {
                                 _functionDeclarationSignatureDictionary.Clear(); //Clear to avoid key collision
-                                                                                //On CALL get possible procedures and functions in the seeked program
+                                                                                 //On CALL get possible procedures and functions in the seeked program
                                 var program = node.SymbolTable.GetPrograms(matchesDeclaringProgram).FirstOrDefault();
                                 if (program != null)
                                 {
                                     var procedures = program.SymbolTable.GetFunctions(StartsWithUserFilter, SymbolTable.Scope.Program);
-                                    completionItems.AddRange(CompletionFactoryHelpers.CreateCompletionItemsForProcedures(procedures, node, _functionDeclarationSignatureDictionary, false));
-
+                                    yield return CompletionFactoryHelpers.CreateCompletionItemsForProcedures(procedures, node, _functionDeclarationSignatureDictionary, false);
                                 }
                                 break;
                             }
@@ -206,15 +203,15 @@ void FilterByUserText(List<Node> nodes)
                                 if (program != null)
                                 {
                                     var types = program.SymbolTable.GetTypes(StartsWithUserFilter, SymbolTable.Scope.Program);
-                                    completionItems.AddRange(CompletionFactoryHelpers.CreateCompletionItemsForType(types, node, false));
+                                    yield return CompletionFactoryHelpers.CreateCompletionItemsForType(types, node, false);
                                 }
                                 break;
                             }
                     }
                 }
-            }
 
-            return completionItems.Distinct().ToList();
+                yield return variableItems;
+            }
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForTo.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForTo.cs
index 321cd052b..0ca88e320 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForTo.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForTo.cs	
@@ -18,15 +18,15 @@ public CompletionForTo(Token userFilterToken, Token lastSignificantToken)
             _lastSignificantToken = lastSignificantToken;
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
             var compatibleDataTypes = new HashSet<DataType>();
             var arrangedCodeElement = codeElement as CodeElementWrapper;
             if (arrangedCodeElement == null)
-                return new List<CompletionItem>();
+                return [];
             var node = GetMatchingNode(compilationUnit, codeElement);
             if (node == null)
-                return new List<CompletionItem>();
+                return [];
 
             Func<DataDefinition, bool> variablePredicate =
                 da =>
@@ -186,7 +186,7 @@ public override List<CompletionItem> ComputeProposals(CompilationUnit compilatio
                 //don't do this if there is no need to qualify or let method CreateCompletionItemsForVariableSetAndDisambiguate call this if necessary
                 .SelectMany(v => node.SymbolTable.GetVariablesExplicitWithQualifiedName(new URI(v.Name)));
 
-            return CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions);
+            return [ CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions) ];
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForType.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForType.cs
index 3e83b1768..f4e67531e 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForType.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForType.cs	
@@ -14,14 +14,14 @@ public CompletionForType(Token userFilterToken)
 
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
             var node = GetMatchingNode(compilationUnit, codeElement);
             if (node?.SymbolTable == null)
-                return new List<CompletionItem>();
+                return [];
 
             var types = node.SymbolTable.GetTypes(StartsWithUserFilter, SymbolTable.Scope.Intrinsic);
-            return CompletionFactoryHelpers.CreateCompletionItemsForType(types, node);
+            return [ CompletionFactoryHelpers.CreateCompletionItemsForType(types, node) ];
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Completion Factory/CompletionForVariable.cs b/TypeCobol.LanguageServer/Completion Factory/CompletionForVariable.cs
index 975a5b54d..1bdc28810 100644
--- a/TypeCobol.LanguageServer/Completion Factory/CompletionForVariable.cs	
+++ b/TypeCobol.LanguageServer/Completion Factory/CompletionForVariable.cs	
@@ -17,19 +17,17 @@ public CompletionForVariable(Token userFilterToken, Predicate<DataDefinition> ad
             _dataDefinitionFilter = additionalDataDefinitionFilter;
         }
 
-        public override List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, CodeElement codeElement)
+        protected override IEnumerable<IEnumerable<CompletionItem>> ComputeProposalGroups(CompilationUnit compilationUnit, CodeElement codeElement)
         {
-            var completionItems = new List<CompletionItem>();
             var node = GetMatchingNode(compilationUnit, codeElement);
             if (node == null)
-                return completionItems;
+                return [];
 
             var variables = node.SymbolTable
                 .GetVariables(d => MatchesWithUserFilter(d) && _dataDefinitionFilter(d), SymbolTable.Scope.Program)
                 .Select(v => new KeyValuePair<DataDefinitionPath, DataDefinition>(null, v));
-            completionItems.AddRange(CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions));
 
-            return completionItems;
+            return [ CompletionFactoryHelpers.CreateCompletionItemsForVariableSetAndDisambiguate(variables, compilationUnit.CompilerOptions) ];
         }
     }
 }
diff --git a/TypeCobol.LanguageServer/Processor/CompletionProcessor.cs b/TypeCobol.LanguageServer/Processor/CompletionProcessor.cs
index 6a741b1c9..4823654bd 100644
--- a/TypeCobol.LanguageServer/Processor/CompletionProcessor.cs
+++ b/TypeCobol.LanguageServer/Processor/CompletionProcessor.cs
@@ -136,20 +136,6 @@ public List<CompletionItem> ComputeProposals(CompilationUnit compilationUnit, Po
                 }
             }
 
-            if (userFilterToken != null)
-            {
-                //Add the range object to let the client know the position of the user filter token
-                var range = VsCodeProtocol.Range.FromPositions(userFilterToken.Line - 1, userFilterToken.StartIndex, userFilterToken.Line - 1, userFilterToken.StopIndex + 1);
-                //-1 on line to 0 based / +1 on stop index to include the last character
-                items.ForEach(c =>
-                {
-                    if (c.data != null && c.data.GetType().IsArray)
-                        ((object[])c.data)[0] = range;
-                    else
-                        c.data = range;
-                });
-            }
-
             return items;
 
             // Check what is before cursor, also set userFilterToken when possible