diff --git a/src/scribe_data/check/check_query_forms.py b/src/scribe_data/check/check_query_forms.py
index f87bac903..a9399cc41 100644
--- a/src/scribe_data/check/check_query_forms.py
+++ b/src/scribe_data/check/check_query_forms.py
@@ -224,7 +224,7 @@ def check_query_forms() -> None:
 
                 if incorrect_query_labels:
                     current_rep_label_to_correct_label_str = [
-                        f"{incorrect_query_labels[i][0]}: {incorrect_query_labels[i][1]}"
+                        f"{incorrect_query_labels[i][0]} : {incorrect_query_labels[i][1]}"
                         for i in range(len(incorrect_query_labels))
                     ]
                     incorrect_query_form_rep_labels_str = "\n  - ".join(
@@ -242,6 +242,9 @@ def check_query_forms() -> None:
         print("Please correct the above lexeme form representation labels.")
         exit(1)
 
+    else:
+        print("All query forms are labeled and formatted correctly.")
+
 
 if __name__ == "__main__":
     check_query_forms()
diff --git a/src/scribe_data/language_data_extraction/Arabic/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Arabic/adjectives/query_adjectives.sparql
index 60275a1c5..eae27703e 100644
--- a/src/scribe_data/language_data_extraction/Arabic/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Arabic/adjectives/query_adjectives.sparql
@@ -5,30 +5,30 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?femSingularNominativeIndef
-  ?masSingularNominativeIndef
-  ?femDualNominativeIndef
-  ?masDualNominativeIndef
-  ?femPluralNominativeIndef
-  ?masPluralNominativeIndef
-  ?femSingularAccusativeIndef
-  ?masSingularAccusativeIndef
-  ?femDualAccusativeIndef
-  ?masDualAccusativeIndef
-  ?femPluralAccusativeIndef
-  ?masPluralAccusativeIndef
-  ?femSingularGenitiveIndef
-  ?masSingularGenitiveIndef
-  ?femDualGenitiveIndef
-  ?masDualGenitiveIndef
-  ?femPluralGenitiveIndef
-  ?masPluralGenitiveIndef
-  ?femSingularPausalIndef
-  ?masSingularPausalIndef
-  ?femDualPausalIndef
-  ?masDualPausalIndef
-  ?femPluralPausalIndef
-  ?masPluralPausalIndef
+  ?nominativeFeminineIndefiniteSingular
+  ?nominativeMasculineIndefiniteSingular
+  ?nominativeFeminineIndefiniteDual
+  ?nominativeMasculineIndefiniteDual
+  ?nominativeFeminineIndefinitePlural
+  ?nominativeMasculineIndefinitePlural
+  ?accusativeFeminineIndefiniteSingular
+  ?accusativeMasculineIndefiniteSingular
+  ?accusativeFeminineIndefiniteDual
+  ?accusativeMasculineIndefiniteDual
+  ?accusativeFeminineIndefinitePlural
+  ?accusativeMasculineIndefinitePlural
+  ?genitiveFeminineIndefiniteSingular
+  ?genitiveMasculineIndefiniteSingular
+  ?genitiveFeminineIndefiniteDual
+  ?genitiveMasculineIndefiniteDual
+  ?genitiveFeminineIndefinitePlural
+  ?genitiveMasculineIndefinitePlural
+  ?pausalFeminineIndefiniteSingular
+  ?pausalMasculineIndefiniteSingular
+  ?pausalFeminineIndefiniteDual
+  ?pausalMasculineIndefiniteDual
+  ?pausalFeminineIndefinitePlural
+  ?pausalMasculineIndefinitePlural
 
 WHERE {
   ?lexeme dct:language wd:Q13955 ;
@@ -40,42 +40,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularNominativeIndefForm .
-    ?femSingularNominativeIndefForm ontolex:representation ?femSingularNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineIndefiniteSingularForm .
+    ?nominativeFeminineIndefiniteSingularForm ontolex:representation ?nominativeFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q131105, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularNominativeIndefForm .
-    ?masSingularNominativeIndefForm ontolex:representation ?masSingularNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineIndefiniteSingularForm .
+    ?nominativeMasculineIndefiniteSingularForm ontolex:representation ?nominativeMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q131105, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualNominativeIndefForm .
-    ?femDualNominativeIndefForm ontolex:representation ?femDualNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineIndefiniteDualForm .
+    ?nominativeFeminineIndefiniteDualForm ontolex:representation ?nominativeFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q131105, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualNominativeIndefForm .
-    ?masDualNominativeIndefForm ontolex:representation ?masDualNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineIndefiniteDualForm .
+    ?nominativeMasculineIndefiniteDualForm ontolex:representation ?nominativeMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q131105, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralNominativeIndefForm .
-    ?femPluralNominativeIndefForm ontolex:representation ?femPluralNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineIndefinitePluralForm .
+    ?nominativeFeminineIndefinitePluralForm ontolex:representation ?nominativeFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q131105, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralNominativeIndefForm .
-    ?masPluralNominativeIndefForm ontolex:representation ?masPluralNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineIndefinitePluralForm .
+    ?nominativeMasculineIndefinitePluralForm ontolex:representation ?nominativeMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q131105, wd:Q53997857 .
   }
 
@@ -84,42 +84,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularAccusativeIndefForm .
-    ?femSingularAccusativeIndefForm ontolex:representation ?femSingularAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineIndefiniteSingularForm .
+    ?accusativeFeminineIndefiniteSingularForm ontolex:representation ?accusativeFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q146078, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularAccusativeIndefForm .
-    ?masSingularAccusativeIndefForm ontolex:representation ?masSingularAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineIndefiniteSingularForm .
+    ?accusativeMasculineIndefiniteSingularForm ontolex:representation ?accusativeMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q146078, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualAccusativeIndefForm .
-    ?femDualAccusativeIndefForm ontolex:representation ?femDualAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineIndefiniteDualForm .
+    ?accusativeFeminineIndefiniteDualForm ontolex:representation ?accusativeFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q146078, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualAccusativeIndefForm .
-    ?masDualAccusativeIndefForm ontolex:representation ?masDualAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineIndefiniteDualForm .
+    ?accusativeMasculineIndefiniteDualForm ontolex:representation ?accusativeMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q146078, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralAccusativeIndefForm .
-    ?femPluralAccusativeIndefForm ontolex:representation ?femPluralAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineIndefinitePluralForm .
+    ?accusativeFeminineIndefinitePluralForm ontolex:representation ?accusativeFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q146078, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralAccusativeIndefForm .
-    ?masPluralAccusativeIndefForm ontolex:representation ?masPluralAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineIndefinitePluralForm .
+    ?accusativeMasculineIndefinitePluralForm ontolex:representation ?accusativeMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q146078, wd:Q53997857 .
   }
 
@@ -128,42 +128,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularGanitiveIndefForm .
-    ?femSingularGanitiveIndefForm ontolex:representation ?femSingularGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineIndefiniteSingularForm .
+    ?genitiveFeminineIndefiniteSingularForm ontolex:representation ?genitiveFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q146233, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularGanitiveIndefForm .
-    ?masSingularGanitiveIndefForm ontolex:representation ?masSingularGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineIndefiniteSingularForm .
+    ?genitiveMasculineIndefiniteSingularForm ontolex:representation ?genitiveMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q146233, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualGanitiveIndefForm .
-    ?femDualGanitiveIndefForm ontolex:representation ?femDualGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineIndefiniteDualForm .
+    ?genitiveFeminineIndefiniteDualForm ontolex:representation ?genitiveFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q146233, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualGanitiveIndefForm .
-    ?masDualGanitiveIndefForm ontolex:representation ?masDualGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineIndefiniteDualForm .
+    ?genitiveMasculineIndefiniteDualForm ontolex:representation ?genitiveMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q146233, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralGanitiveIndefForm .
-    ?femPluralGanitiveIndefForm ontolex:representation ?femPluralGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineIndefinitePluralForm .
+    ?genitiveFeminineIndefinitePluralForm ontolex:representation ?genitiveFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q146233, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralGanitiveIndefForm .
-    ?masPluralGanitiveIndefForm ontolex:representation ?masPluralGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineIndefinitePluralForm .
+    ?genitiveMasculineIndefinitePluralForm ontolex:representation ?genitiveMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q146233, wd:Q53997857 .
   }
 
@@ -172,42 +172,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularPausalIndefForm .
-    ?femSingularPausalIndefForm ontolex:representation ?femSingularPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalFeminineIndefiniteSingularForm .
+    ?pausalFeminineIndefiniteSingularForm ontolex:representation ?pausalFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q117262361, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularPausalIndefForm .
-    ?masSingularPausalIndefForm ontolex:representation ?masSingularPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalMasculineIndefiniteSingularForm .
+    ?pausalMasculineIndefiniteSingularForm ontolex:representation ?pausalMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q117262361, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualPausalIndefForm .
-    ?femDualPausalIndefForm ontolex:representation ?femDualPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalFeminineIndefiniteDualForm .
+    ?pausalFeminineIndefiniteDualForm ontolex:representation ?pausalFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q117262361, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualPausalIndefForm .
-    ?masDualPausalIndefForm ontolex:representation ?masDualPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalMasculineIndefiniteDualForm .
+    ?pausalMasculineIndefiniteDualForm ontolex:representation ?pausalMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q117262361, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralPausalIndefForm .
-    ?femPluralPausalIndefForm ontolex:representation ?femPluralPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalFeminineIndefinitePluralForm .
+    ?pausalFeminineIndefinitePluralForm ontolex:representation ?pausalFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q117262361, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralPausalIndefForm .
-    ?masPluralPausalIndefForm ontolex:representation ?masPluralPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalMasculineIndefinitePluralForm .
+    ?pausalMasculineIndefinitePluralForm ontolex:representation ?pausalMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q117262361, wd:Q53997857 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Arabic/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Arabic/nouns/query_nouns.sparql
index dda244732..c321b9127 100644
--- a/src/scribe_data/language_data_extraction/Arabic/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Arabic/nouns/query_nouns.sparql
@@ -6,33 +6,33 @@ SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?noun
 
-  ?femSingularNominativeIndef
-  ?masSingularNominativeIndef
-  ?femDualNominativeIndef
-  ?masDualNominativeIndef
-  ?femPluralNominativeIndef
-  ?masPluralNominativeIndef
-
-  ?femSingularAccusativeIndef
-  ?masSingularAccusativeIndef
-  ?femDualAccusativeIndef
-  ?masDualAccusativeIndef
-  ?femPluralAccusativeIndef
-  ?masPluralAccusativeIndef
-
-  ?femSingularGenitiveIndef
-  ?masSingularGenitiveIndef
-  ?femDualGenitiveIndef
-  ?masDualGenitiveIndef
-  ?femPluralGenitiveIndef
-  ?masPluralGenitiveIndef
-
-  ?femSingularPausalIndef
-  ?masSingularPausalIndef
-  ?femDualPausalIndef
-  ?masDualPausalIndef
-  ?femPluralPausalIndef
-  ?masPluralPausalIndef
+  ?nominativeFeminineIndefiniteSingular
+  ?nominativeMasculineIndefiniteSingular
+  ?nominativeFeminineIndefiniteDual
+  ?nominativeMasculineIndefiniteDual
+  ?nominativeFeminineIndefinitePlural
+  ?nominativeMasculineIndefinitePlural
+
+  ?accusativeFeminineIndefiniteSingular
+  ?accusativeMasculineIndefiniteSingular
+  ?accusativeFeminineIndefiniteDual
+  ?accusativeMasculineIndefiniteDual
+  ?accusativeFeminineIndefinitePlural
+  ?accusativeMasculineIndefinitePlural
+
+  ?genitiveFeminineIndefiniteSingular
+  ?genitiveMasculineIndefiniteSingular
+  ?genitiveFeminineIndefiniteDual
+  ?genitiveMasculineIndefiniteDual
+  ?genitiveFeminineIndefinitePlural
+  ?genitiveMasculineIndefinitePlural
+
+  ?pausalFeminineIndefiniteSingular
+  ?pausalMasculineIndefiniteSingular
+  ?pausalFeminineIndefiniteDual
+  ?pausalMasculineIndefiniteDual
+  ?pausalFeminineIndefinitePlural
+  ?pausalMasculineIndefinitePlural
 
 WHERE {
   ?lexeme dct:language wd:Q13955 ;
@@ -44,42 +44,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularNominativeIndefForm .
-    ?femSingularNominativeIndefForm ontolex:representation ?femSingularNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineIndefiniteSingularForm .
+    ?nominativeFeminineIndefiniteSingularForm ontolex:representation ?nominativeFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q131105, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularNominativeIndefForm .
-    ?masSingularNominativeIndefForm ontolex:representation ?masSingularNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineIndefiniteSingularForm .
+    ?nominativeMasculineIndefiniteSingularForm ontolex:representation ?nominativeMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q131105, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualNominativeIndefForm .
-    ?femDualNominativeIndefForm ontolex:representation ?femDualNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineIndefiniteDualForm .
+    ?nominativeFeminineIndefiniteDualForm ontolex:representation ?nominativeFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q131105, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualNominativeIndefForm .
-    ?masDualNominativeIndefForm ontolex:representation ?masDualNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineIndefiniteDualForm .
+    ?nominativeMasculineIndefiniteDualForm ontolex:representation ?nominativeMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q131105, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralNominativeIndefForm .
-    ?femPluralNominativeIndefForm ontolex:representation ?femPluralNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineIndefinitePluralForm .
+    ?nominativeFeminineIndefinitePluralForm ontolex:representation ?nominativeFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q131105, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralNominativeIndefForm .
-    ?masPluralNominativeIndefForm ontolex:representation ?masPluralNominativeIndef ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineIndefinitePluralForm .
+    ?nominativeMasculineIndefinitePluralForm ontolex:representation ?nominativeMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q131105, wd:Q53997857 .
   }
 
@@ -88,42 +88,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularAccusativeIndefForm .
-    ?femSingularAccusativeIndefForm ontolex:representation ?femSingularAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineIndefiniteSingularForm .
+    ?accusativeFeminineIndefiniteSingularForm ontolex:representation ?accusativeFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q146078, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularAccusativeIndefForm .
-    ?masSingularAccusativeIndefForm ontolex:representation ?masSingularAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineIndefiniteSingularForm .
+    ?accusativeMasculineIndefiniteSingularForm ontolex:representation ?accusativeMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q146078, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualAccusativeIndefForm .
-    ?femDualAccusativeIndefForm ontolex:representation ?femDualAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineIndefiniteDualForm .
+    ?accusativeFeminineIndefiniteDualForm ontolex:representation ?accusativeFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q146078, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualAccusativeIndefForm .
-    ?masDualAccusativeIndefForm ontolex:representation ?masDualAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineIndefiniteDualForm .
+    ?accusativeMasculineIndefiniteDualForm ontolex:representation ?accusativeMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q146078, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralAccusativeIndefForm .
-    ?femPluralAccusativeIndefForm ontolex:representation ?femPluralAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineIndefinitePluralForm .
+    ?accusativeFeminineIndefinitePluralForm ontolex:representation ?accusativeFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q146078, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralAccusativeIndefForm .
-    ?masPluralAccusativeIndefForm ontolex:representation ?masPluralAccusativeIndef ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineIndefinitePluralForm .
+    ?accusativeMasculineIndefinitePluralForm ontolex:representation ?accusativeMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q146078, wd:Q53997857 .
   }
 
@@ -132,42 +132,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularGanitiveIndefForm .
-    ?femSingularGanitiveIndefForm ontolex:representation ?femSingularGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineIndefiniteSingularForm .
+    ?genitiveFeminineIndefiniteSingularForm ontolex:representation ?genitiveFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q146233, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularGanitiveIndefForm .
-    ?masSingularGanitiveIndefForm ontolex:representation ?masSingularGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineIndefiniteSingularForm .
+    ?genitiveMasculineIndefiniteSingularForm ontolex:representation ?genitiveMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q146233, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualGanitiveIndefForm .
-    ?femDualGanitiveIndefForm ontolex:representation ?femDualGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineIndefiniteDualForm .
+    ?genitiveFeminineIndefiniteDualForm ontolex:representation ?genitiveFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q146233, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualGanitiveIndefForm .
-    ?masDualGanitiveIndefForm ontolex:representation ?masDualGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineIndefiniteDualForm .
+    ?genitiveMasculineIndefiniteDualForm ontolex:representation ?genitiveMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q146233, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralGanitiveIndefForm .
-    ?femPluralGanitiveIndefForm ontolex:representation ?femPluralGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineIndefinitePluralForm .
+    ?genitiveFeminineIndefinitePluralForm ontolex:representation ?genitiveFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q146233, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralGanitiveIndefForm .
-    ?masPluralGanitiveIndefForm ontolex:representation ?masPluralGanitiveIndef ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineIndefinitePluralForm .
+    ?genitiveMasculineIndefinitePluralForm ontolex:representation ?genitiveMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q146233, wd:Q53997857 .
   }
 
@@ -176,42 +176,42 @@ WHERE {
   # Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularPausalIndefForm .
-    ?femSingularPausalIndefForm ontolex:representation ?femSingularPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalFeminineIndefiniteSingularForm .
+    ?pausalFeminineIndefiniteSingularForm ontolex:representation ?pausalFeminineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q117262361, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularPausalIndefForm .
-    ?masSingularPausalIndefForm ontolex:representation ?masSingularPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalMasculineIndefiniteSingularForm .
+    ?pausalMasculineIndefiniteSingularForm ontolex:representation ?pausalMasculineIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q117262361, wd:Q53997857 .
   }
 
   # Dual
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femDualPausalIndefForm .
-    ?femDualPausalIndefForm ontolex:representation ?femDualPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalFeminineIndefiniteDualForm .
+    ?pausalFeminineIndefiniteDualForm ontolex:representation ?pausalFeminineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110022, wd:Q117262361, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masDualPausalIndefForm .
-    ?masDualPausalIndefForm ontolex:representation ?masDualPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalMasculineIndefiniteDualForm .
+    ?pausalMasculineIndefiniteDualForm ontolex:representation ?pausalMasculineIndefiniteDual ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110022, wd:Q117262361, wd:Q53997857 .
   }
 
   # Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralPausalIndefForm .
-    ?femPluralPausalIndefForm ontolex:representation ?femPluralPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalFeminineIndefinitePluralForm .
+    ?pausalFeminineIndefinitePluralForm ontolex:representation ?pausalFeminineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q117262361, wd:Q53997857 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralPausalIndefForm .
-    ?masPluralPausalIndefForm ontolex:representation ?masPluralPausalIndef ;
+    ?lexeme ontolex:lexicalForm ?pausalMasculineIndefinitePluralForm .
+    ?pausalMasculineIndefinitePluralForm ontolex:representation ?pausalMasculineIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q117262361, wd:Q53997857 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_1.sparql
index 60308b2f4..6251f4f11 100644
--- a/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_1.sparql
@@ -5,9 +5,17 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?verb
-  ?presFPS ?presSPSM ?presSPSF ?presTPSM ?presTPSF
-  ?presSPD ?presTPDM ?presTPDF
-  ?presFPP ?presSPPM ?presSPPF
+  ?indicativeFirstPersonSingularFiilMudari
+  ?feminineIndicativeSecondPersonSingularFiilMudari
+  ?masculineIndicativeSecondPersonSingularFiilMudari
+  ?feminineIndicativeThirdPersonSingularFiilMudari
+  ?masculineIndicativeThirdPersonSingularFiilMudari
+  ?indicativeSecondPersonDualFiilMudari
+  ?feminineIndicativeThirdPersonDualFiilMudari
+  ?masculineIndicativeThirdPersonDualFiilMudari
+  ?indicativeFirstPersonPluralFiilMudari
+  ?feminineIndicativeSecondPersonPluralFiilMudari
+  ?masculineIndicativeSecondPersonPluralFiilMudari
 
 WHERE {
   ?lexeme dct:language wd:Q13955 ;
@@ -17,68 +25,68 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeFirstPersonSingularFiilMudariForm .
+    ?indicativeFirstPersonSingularFiilMudariForm ontolex:representation ?indicativeFirstPersonSingularFiilMudari ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSMForm .
-    ?presSPSMForm ontolex:representation ?presSPSM ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q499327, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?feminineIndicativeSecondPersonSingularFiilMudariForm .
+    ?feminineIndicativeSecondPersonSingularFiilMudariForm ontolex:representation ?feminineIndicativeSecondPersonSingularFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSFForm .
-    ?presSPSFForm ontolex:representation ?presSPSF ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?masculineIndicativeSecondPersonSingularFiilMudariForm .
+    ?masculineIndicativeSecondPersonSingularFiilMudariForm ontolex:representation ?masculineIndicativeSecondPersonSingularFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q499327, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSMForm .
-    ?presTPSMForm ontolex:representation ?presTPSM ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q499327, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?feminineIndicativeThirdPersonSingularFiilMudariForm .
+    ?feminineIndicativeThirdPersonSingularFiilMudariForm ontolex:representation ?feminineIndicativeThirdPersonSingularFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSFForm .
-    ?presTPSFForm ontolex:representation ?presTPSF ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?masculineIndicativeThirdPersonSingularFiilMudariForm .
+    ?masculineIndicativeThirdPersonSingularFiilMudariForm ontolex:representation ?masculineIndicativeThirdPersonSingularFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q499327, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPDForm .
-    ?presSPDForm ontolex:representation ?presSPD ;
+    ?lexeme ontolex:lexicalForm ?indicativeSecondPersonDualFiilMudariForm .
+    ?indicativeSecondPersonDualFiilMudariForm ontolex:representation ?indicativeSecondPersonDualFiilMudari ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110022, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPDMForm .
-    ?presTPDMForm ontolex:representation ?presTPDM ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q499327, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?feminineIndicativeThirdPersonDualFiilMudariForm .
+    ?feminineIndicativeThirdPersonDualFiilMudariForm ontolex:representation ?feminineIndicativeThirdPersonDualFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q1775415, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPDFForm .
-    ?presTPDFForm ontolex:representation ?presTPDF ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q1775415, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?masculineIndicativeThirdPersonDualFiilMudariForm .
+    ?masculineIndicativeThirdPersonDualFiilMudariForm ontolex:representation ?masculineIndicativeThirdPersonDualFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q499327, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeFirstPersonPluralFiilMudariForm .
+    ?indicativeFirstPersonPluralFiilMudariForm ontolex:representation ?indicativeFirstPersonPluralFiilMudari ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPMForm .
-    ?presSPPMForm ontolex:representation ?presSPPM ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q499327, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?feminineIndicativeSecondPersonPluralFiilMudariForm .
+    ?feminineIndicativeSecondPersonPluralFiilMudariForm ontolex:representation ?feminineIndicativeSecondPersonPluralFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPFForm .
-    ?presSPPFForm ontolex:representation ?presSPPF ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
+    ?lexeme ontolex:lexicalForm ?masculineIndicativeSecondPersonPluralFiilMudariForm .
+    ?masculineIndicativeSecondPersonPluralFiilMudariForm ontolex:representation ?masculineIndicativeSecondPersonPluralFiilMudari ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q499327, wd:Q682111, wd:Q12230930 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_2.sparql
index 5b66b9827..f69837ae1 100644
--- a/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_2.sparql
@@ -5,9 +5,17 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?verb
-  ?pastFPS ?pastSPSM ?pastSPSF ?pastTPSM ?pastTPSF
-  ?pastSPD ?pastTPDM ?pastTPDF
-  ?pastFPP ?pastSPPM ?pastSPPF
+  ?activePerformativeFirstPersonSingular
+  ?feminineActivePerformativeSecondPersonSingular
+  ?masculineActivePerformativeSecondPersonSingular
+  ?feminineActivePerformativeThirdPersonSingular
+  ?masculineActivePerformativeThirdPersonSingular
+  ?activePerformativeSecondPersonDual
+  ?feminineActivePerformativeThirdPersonDual
+  ?masculineActivePerformativeThirdPersonDual
+  ?activePerformativeFirstPersonPlural
+  ?feminineActivePerformativeSecondPersonPlural
+  ?masculineActivePerformativeSecondPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q13955 ;
@@ -17,68 +25,68 @@ WHERE {
   # MARK: Performative Past
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastFPSForm .
-    ?pastFPSForm ontolex:representation ?pastFPS ;
+    ?lexeme ontolex:lexicalForm ?activePerformativeFirstPersonSingularForm .
+    ?activePerformativeFirstPersonSingularForm ontolex:representation ?activePerformativeFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPSMForm .
-    ?pastSPSMForm ontolex:representation ?pastSPSM ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q499327, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?feminineActivePerformativeSecondPersonSingularForm .
+    ?feminineActivePerformativeSecondPersonSingularForm ontolex:representation ?feminineActivePerformativeSecondPersonSingular ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPSFForm .
-    ?pastSPSFForm ontolex:representation ?pastSPSF ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?masculineActivePerformativeSecondPersonSingularForm .
+    ?masculineActivePerformativeSecondPersonSingularForm ontolex:representation ?masculineActivePerformativeSecondPersonSingular ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q499327, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPSMForm .
-    ?pastTPSMForm ontolex:representation ?pastTPSM ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q499327, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?feminineActivePerformativeThirdPersonSingularForm .
+    ?feminineActivePerformativeThirdPersonSingularForm ontolex:representation ?feminineActivePerformativeThirdPersonSingular ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPSFForm .
-    ?pastTPSFForm ontolex:representation ?pastTPSF ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?masculineActivePerformativeThirdPersonSingularForm .
+    ?masculineActivePerformativeThirdPersonSingularForm ontolex:representation ?masculineActivePerformativeThirdPersonSingular ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q499327, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPDForm .
-    ?pastSPDForm ontolex:representation ?pastSPD ;
+    ?lexeme ontolex:lexicalForm ?activePerformativeSecondPersonDualForm .
+    ?activePerformativeSecondPersonDualForm ontolex:representation ?activePerformativeSecondPersonDual ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110022, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPDMForm .
-    ?pastTPDMForm ontolex:representation ?pastTPDM ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q499327, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?feminineActivePerformativeThirdPersonDualForm .
+    ?feminineActivePerformativeThirdPersonDualForm ontolex:representation ?feminineActivePerformativeThirdPersonDual ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPDFForm .
-    ?pastTPDFForm ontolex:representation ?pastTPDF ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?masculineActivePerformativeThirdPersonDualForm .
+    ?masculineActivePerformativeThirdPersonDualForm ontolex:representation ?masculineActivePerformativeThirdPersonDual ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110022, wd:Q499327, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastFPPForm .
-    ?pastFPPForm ontolex:representation ?pastFPP ;
+    ?lexeme ontolex:lexicalForm ?activePerformativeFirstPersonPluralForm .
+    ?activePerformativeFirstPersonPluralForm ontolex:representation ?activePerformativeFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPPMForm .
-    ?pastSPPMForm ontolex:representation ?pastSPPM ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q499327, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?feminineActivePerformativeSecondPersonPluralForm .
+    ?feminineActivePerformativeSecondPersonPluralForm ontolex:representation ?feminineActivePerformativeSecondPersonPlural ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPPFForm .
-    ?pastSPPFForm ontolex:representation ?pastSPPF ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1775415, wd:Q1317831, wd:Q124351233 .
+    ?lexeme ontolex:lexicalForm ?masculineActivePerformativeSecondPersonPluralForm .
+    ?masculineActivePerformativeSecondPersonPluralForm ontolex:representation ?masculineActivePerformativeSecondPersonPlural ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q499327, wd:Q1317831, wd:Q124351233 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_3.sparql b/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_3.sparql
index 0e6739d47..4184579e9 100644
--- a/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_3.sparql
+++ b/src/scribe_data/language_data_extraction/Arabic/verbs/query_verbs_3.sparql
@@ -5,8 +5,11 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?verb
-  ?impSPSM ?impSPSF ?impSPD
-  ?impSPPM ?impSPPF
+  ?masculineIndicativeSecondPersonSingularFiilMudari
+  ?feminineIndicativeSecondPersonSingularFiilMudari
+  ?indicativeSecondPersonDualFiilMudari
+  ?masculineIndicativeSecondPersonPluralFiilMudari
+  ?feminineIndicativeSecondPersonPluralFiilMudari
 
 WHERE {
   ?lexeme dct:language wd:Q13955 ;
@@ -16,32 +19,32 @@ WHERE {
   # MARK: Imperative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSMForm .
-    ?impSPSMForm ontolex:representation ?impSPSM ;
+    ?lexeme ontolex:lexicalForm ?masculineIndicativeSecondPersonSingularFiilMudariForm .
+    ?masculineIndicativeSecondPersonSingularFiilMudariForm ontolex:representation ?masculineIndicativeSecondPersonSingularFiilMudari ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q499327, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSFForm .
-    ?impSPSFForm ontolex:representation ?impSPSF ;
+    ?lexeme ontolex:lexicalForm ?feminineIndicativeSecondPersonSingularFiilMudariForm .
+    ?feminineIndicativeSecondPersonSingularFiilMudariForm ontolex:representation ?feminineIndicativeSecondPersonSingularFiilMudari ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPDForm .
-    ?impSPDForm ontolex:representation ?impSPD ;
+    ?lexeme ontolex:lexicalForm ?indicativeSecondPersonDualFiilMudariForm .
+    ?indicativeSecondPersonDualFiilMudariForm ontolex:representation ?indicativeSecondPersonDualFiilMudari ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110022, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPMForm .
-    ?impSPPMForm ontolex:representation ?impSPPM ;
+    ?lexeme ontolex:lexicalForm ?masculineIndicativeSecondPersonPluralFiilMudariForm .
+    ?masculineIndicativeSecondPersonPluralFiilMudariForm ontolex:representation ?masculineIndicativeSecondPersonPluralFiilMudari ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q499327, wd:Q682111, wd:Q12230930 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPFForm .
-    ?impSPPFForm ontolex:representation ?impSPPF ;
+    ?lexeme ontolex:lexicalForm ?feminineIndicativeSecondPersonPluralFiilMudariForm .
+    ?feminineIndicativeSecondPersonPluralFiilMudariForm ontolex:representation ?feminineIndicativeSecondPersonPluralFiilMudari ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1775415, wd:Q682111, wd:Q12230930 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Basque/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Basque/nouns/query_nouns.sparql
index 40763778d..44cc0a4aa 100644
--- a/src/scribe_data/language_data_extraction/Basque/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Basque/nouns/query_nouns.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?absIndefinite
-  ?absSingular
-  ?absPlural
+  ?absolutiveSingular
+  ?absolutivePlural
 
 WHERE {
   ?lexeme dct:language wd:Q8752 ;
@@ -16,16 +16,16 @@ WHERE {
   # MARK: Absolutive Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?absSingularForm .
-    ?absSingularForm ontolex:representation ?absSingular ;
+    ?lexeme ontolex:lexicalForm ?absolutiveSingularForm .
+    ?absolutiveSingularForm ontolex:representation ?absolutiveSingular ;
       wikibase:grammaticalFeature wd:Q332734, wd:Q110786 .
   }
 
   # MARK: Absolutive Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?absPluralForm .
-    ?absPluralForm ontolex:representation ?absPlural ;
+    ?lexeme ontolex:lexicalForm ?absolutivePluralForm .
+    ?absolutivePluralForm ontolex:representation ?absolutivePlural ;
       wikibase:grammaticalFeature wd:Q332734, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Bengali/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Bengali/nouns/query_nouns.sparql
index d40bd804e..b57a0517c 100644
--- a/src/scribe_data/language_data_extraction/Bengali/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Bengali/nouns/query_nouns.sparql
@@ -16,32 +16,32 @@ WHERE {
   # MARK: Nminative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomForm .
-    ?nomForm ontolex:representation ?nominative ;
+    ?lexeme ontolex:lexicalForm ?nominativeForm .
+    ?nominativeForm ontolex:representation ?nominative ;
       wikibase:grammaticalFeature wd:Q131105 .
   }
 
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genForm .
-    ?genForm ontolex:representation ?genitive ;
+    ?lexeme ontolex:lexicalForm ?genitiveForm .
+    ?genitiveForm ontolex:representation ?genitive ;
       wikibase:grammaticalFeature wd:Q146233 .
   }
 
   # MARK: Accusative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?accForm .
-    ?accForm ontolex:representation ?accusative ;
+    ?lexeme ontolex:lexicalForm ?accusativeForm .
+    ?accusativeForm ontolex:representation ?accusative ;
       wikibase:grammaticalFeature wd:Q146078 .
   }
 
   # MARK: Locative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?locForm .
-    ?locForm ontolex:representation ?locative ;
+    ?lexeme ontolex:lexicalForm ?locativeForm .
+    ?locativeForm ontolex:representation ?locative ;
       wikibase:grammaticalFeature wd:Q202142 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Bengali/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Bengali/proper_nouns/query_proper_nouns.sparql
index 2519f3ba5..f795cc083 100644
--- a/src/scribe_data/language_data_extraction/Bengali/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Bengali/proper_nouns/query_proper_nouns.sparql
@@ -16,32 +16,32 @@ WHERE {
   # MARK: Nminative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomForm .
-    ?nomForm ontolex:representation ?nominative ;
+    ?lexeme ontolex:lexicalForm ?nominativeForm .
+    ?nominativeForm ontolex:representation ?nominative ;
       wikibase:grammaticalFeature wd:Q131105 .
   }
 
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genForm .
-    ?genForm ontolex:representation ?genitive ;
+    ?lexeme ontolex:lexicalForm ?genitiveForm .
+    ?genitiveForm ontolex:representation ?genitive ;
       wikibase:grammaticalFeature wd:Q146233 .
   }
 
   # MARK: Accusative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?accForm .
-    ?accForm ontolex:representation ?accusative ;
+    ?lexeme ontolex:lexicalForm ?accusativeForm .
+    ?accusativeForm ontolex:representation ?accusative ;
       wikibase:grammaticalFeature wd:Q146078 .
   }
 
   # MARK: Locative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?locForm .
-    ?locForm ontolex:representation ?locative ;
+    ?lexeme ontolex:lexicalForm ?locativeForm .
+    ?locativeForm ontolex:representation ?locative ;
       wikibase:grammaticalFeature wd:Q202142 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Chinese/Mandarin/adverbs/query_adverbs.sparql b/src/scribe_data/language_data_extraction/Chinese/Mandarin/adverbs/query_adverbs.sparql
index 3b675b1f9..b5d675545 100644
--- a/src/scribe_data/language_data_extraction/Chinese/Mandarin/adverbs/query_adverbs.sparql
+++ b/src/scribe_data/language_data_extraction/Chinese/Mandarin/adverbs/query_adverbs.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q727694 ;
     wikibase:lexicalCategory wd:Q380057 ;
     wikibase:lemma ?adverb .
-    FILTER(LANG(?adverb) = "zh") .
+    FILTER(LANG(?adverb) = "zh")
 }
diff --git a/src/scribe_data/language_data_extraction/Czech/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Czech/nouns/query_nouns.sparql
index 11989c386..f8e9f77cb 100644
--- a/src/scribe_data/language_data_extraction/Czech/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Czech/nouns/query_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -15,16 +15,16 @@ WHERE {
   # MARK: Nominative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Czech/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Czech/proper_nouns/query_proper_nouns.sparql
index 7ac04125c..bc730b44f 100644
--- a/src/scribe_data/language_data_extraction/Czech/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Czech/proper_nouns/query_proper_nouns.sparql
@@ -5,7 +5,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?properNoun
-  ?nomPlural
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -16,8 +16,8 @@ WHERE {
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_1.sparql
index 7b5a37ab3..f3c32b63f 100644
--- a/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_1.sparql
@@ -4,22 +4,24 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-
   ?infinitive
-
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
-
-  ?FPPImp ?SPSImp ?SPPImp
-
-  ?femSingularActivePart
-  ?masAnimateSingularActivePart
-  ?masInanimateSingularActivePart
-  ?neutSingularActivePart
-  ?femPluralActivePart
-  ?masAnimatePluralActivePart
-  ?masInanimatePluralActivePart
-  ?neutPluralActivePart
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
+  ?imperativeFirstPersonPlural
+  ?imperativeSecondPersonSingular
+  ?imperativeSecondPersonPlural
+  ?feminineSingularActiveParticiple
+  ?masculineAnimateSingularActiveParticiple
+  ?masculineInanimateSingularActiveParticiple
+  ?neuterSingularActiveParticiple
+  ?femininePluralActiveParticiple
+  ?masculineAnimatePluralActiveParticiple
+  ?masculineInanimatePluralActiveParticiple
+  ?neuterPluralActiveParticiple
 
 WHERE {
   ?lexeme dct:language wd:Q9056 ;
@@ -29,108 +31,108 @@ WHERE {
   # MARK: Indicative Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   # MARK: Imperative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?FPPImpForm .
-    ?FPPImpForm ontolex:representation ?FPPImp ;
+    ?lexeme ontolex:lexicalForm ?imperativeFirstPersonPluralForm .
+    ?imperativeFirstPersonPluralForm ontolex:representation ?imperativeFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q22716 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?SPSImpForm .
-    ?SPSImpForm ontolex:representation ?SPSImp ;
+    ?lexeme ontolex:lexicalForm ?imperativeSecondPersonSingularForm .
+    ?imperativeSecondPersonSingularForm ontolex:representation ?imperativeSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q22716 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?SPPImpForm .
-    ?SPPImpForm ontolex:representation ?SPPImp ;
+    ?lexeme ontolex:lexicalForm ?imperativeSecondPersonPluralForm .
+    ?imperativeSecondPersonPluralForm ontolex:representation ?imperativeSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q22716 .
   }
 
   # MARK: Active Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularActivePartForm .
-    ?femSingularActivePartForm ontolex:representation ?femSingularActivePart ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularActiveParticipleForm .
+    ?feminineSingularActiveParticipleForm ontolex:representation ?feminineSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimateSingularActivePartForm .
-    ?masAnimateSingularActivePartForm ontolex:representation ?masAnimateSingularActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimateSingularActiveParticipleForm .
+    ?masculineAnimateSingularActiveParticipleForm ontolex:representation ?masculineAnimateSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimateSingularActivePartForm .
-    ?masInanimateSingularActivePartForm ontolex:representation ?masInanimateSingularActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimateSingularActiveParticipleForm .
+    ?masculineInanimateSingularActiveParticipleForm ontolex:representation ?masculineInanimateSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutSingularActivePartForm .
-    ?neutSingularActivePartForm ontolex:representation ?neutSingularActivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterSingularActiveParticipleForm .
+    ?neuterSingularActiveParticipleForm ontolex:representation ?neuterSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralActivePartForm .
-    ?femPluralActivePartForm ontolex:representation ?femPluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?femininePluralActiveParticipleForm .
+    ?femininePluralActiveParticipleForm ontolex:representation ?femininePluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimatePluralActivePartForm .
-    ?masAnimatePluralActivePartForm ontolex:representation ?masAnimatePluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimatePluralActiveParticipleForm .
+    ?masculineAnimatePluralActiveParticipleForm ontolex:representation ?masculineAnimatePluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q146786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimatePluralActivePartForm .
-    ?masInanimatePluralActivePartForm ontolex:representation ?masInanimatePluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimatePluralActiveParticipleForm .
+    ?masculineInanimatePluralActiveParticipleForm ontolex:representation ?masculineInanimatePluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q146786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutPluralActivePartForm .
-    ?neutPluralActivePartForm ontolex:representation ?neutPluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterPluralActiveParticipleForm .
+    ?neuterPluralActiveParticipleForm ontolex:representation ?neuterPluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146786, wd:Q72249355 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_2.sparql
index 5aba5e692..1100549bf 100644
--- a/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/Czech/verbs/query_verbs_2.sparql
@@ -5,23 +5,23 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
 
-  ?femSingularPassivePart
-  ?masAnimateSingularPassivePart
-  ?masInanimateSingularPassivePart
-  ?neutSingularPassivePart
-  ?femPluralPassivePart
-  ?masAnimatePluralPassivePart
-  ?masInanimatePluralPassivePart
-  ?neutPluralPassivePart
-
-  ?femSingularPastTransgressive
-  ?masAnimateSingularPastTransgressive
-  ?masInanimateSingularPastTransgressive
-  ?neutSingularPastTransgressive
-  ?femPluralPastTransgressive
-  ?masAnimatePluralPastTransgressive
-  ?masInanimatePluralPastTransgressive
-  ?neutPluralPastTransgressive
+  ?feminineSingularPassiveParticiple
+  ?masculineAnimateSingularPassiveParticiple
+  ?masculineInanimateSingularPassiveParticiple
+  ?neuterSingularPassiveParticiple
+  ?femininePluralPassiveParticiple
+  ?masculineAnimatePluralPassiveParticiple
+  ?masculineInanimatePluralPassiveParticiple
+  ?neuterPluralPassiveParticiple
+
+  ?femininePastTransgressiveSingular
+  ?masculineAnimatePastTransgressiveSingular
+  ?masculineInanimatePastTransgressiveSingular
+  ?neuterPastTransgressiveSingular
+  ?femininePastTransgressivePlural
+  ?masculineAnimatePastTransgressivePlural
+  ?masculineInanimatePastTransgressivePlural
+  ?neuterPastTransgressivePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9056 ;
@@ -30,100 +30,100 @@ WHERE {
   # MARK: Passive Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularPassivePartForm .
-    ?femSingularPassivePartForm ontolex:representation ?femSingularPassivePart ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularPassiveParticipleForm .
+    ?feminineSingularPassiveParticipleForm ontolex:representation ?feminineSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimateSingularPassivePartForm .
-    ?masAnimateSingularPassivePartForm ontolex:representation ?masAnimateSingularPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimateSingularPassiveParticipleForm .
+    ?masculineAnimateSingularPassiveParticipleForm ontolex:representation ?masculineAnimateSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimateSingularPassivePartForm .
-    ?masInanimateSingularPassivePartForm ontolex:representation ?masInanimateSingularPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimateSingularPassiveParticipleForm .
+    ?masculineInanimateSingularPassiveParticipleForm ontolex:representation ?masculineInanimateSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutSingularPassivePartForm .
-    ?neutSingularPassivePartForm ontolex:representation ?neutSingularPassivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterSingularPassiveParticipleForm .
+    ?neuterSingularPassiveParticipleForm ontolex:representation ?neuterSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralPassivePartForm .
-    ?femPluralPassivePartForm ontolex:representation ?femPluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?femininePluralPassiveParticipleForm .
+    ?femininePluralPassiveParticipleForm ontolex:representation ?femininePluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimatePluralPassivePartForm .
-    ?masAnimatePluralPassivePartForm ontolex:representation ?masAnimatePluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimatePluralPassiveParticipleForm .
+    ?masculineAnimatePluralPassiveParticipleForm ontolex:representation ?masculineAnimatePluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q146786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimatePluralPassivePartForm .
-    ?masInanimatePluralPassivePartForm ontolex:representation ?masInanimatePluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimatePluralPassiveParticipleForm .
+    ?masculineInanimatePluralPassiveParticipleForm ontolex:representation ?masculineInanimatePluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q146786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutPluralPassivePartForm .
-    ?neutPluralPassivePartForm ontolex:representation ?neutPluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterPluralPassiveParticipleForm .
+    ?neuterPluralPassiveParticipleForm ontolex:representation ?neuterPluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146786, wd:Q72249544 .
   }
 
   # MARK: Past Transgressive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularPastTransgressiveForm .
-    ?femSingularPastTransgressiveForm ontolex:representation ?femSingularPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?femininePastTransgressiveSingularForm .
+    ?femininePastTransgressiveSingularForm ontolex:representation ?femininePastTransgressiveSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimateSingularPastTransgressiveForm .
-    ?masAnimateSingularPastTransgressiveForm ontolex:representation ?masAnimateSingularPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimatePastTransgressiveSingularForm .
+    ?masculineAnimatePastTransgressiveSingularForm ontolex:representation ?masculineAnimatePastTransgressiveSingular ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q110786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimateSingularPastTransgressiveForm .
-    ?masInanimateSingularPastTransgressiveForm ontolex:representation ?masInanimateSingularPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimatePastTransgressiveSingularForm .
+    ?masculineInanimatePastTransgressiveSingularForm ontolex:representation ?masculineInanimatePastTransgressiveSingular ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q110786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutSingularPastTransgressiveForm .
-    ?neutSingularPastTransgressiveForm ontolex:representation ?neutSingularPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?neuterPastTransgressiveSingularForm .
+    ?neuterPastTransgressiveSingularForm ontolex:representation ?neuterPastTransgressiveSingular ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralPastTransgressiveForm .
-    ?femPluralPastTransgressiveForm ontolex:representation ?femPluralPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?femininePastTransgressivePluralForm .
+    ?femininePastTransgressivePluralForm ontolex:representation ?femininePastTransgressivePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimatePluralPastTransgressiveForm .
-    ?masAnimatePluralPastTransgressiveForm ontolex:representation ?masAnimatePluralPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimatePastTransgressivePluralForm .
+    ?masculineAnimatePastTransgressivePluralForm ontolex:representation ?masculineAnimatePastTransgressivePlural ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q146786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimatePluralPastTransgressiveForm .
-    ?masInanimatePluralPastTransgressiveForm ontolex:representation ?masInanimatePluralPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimatePastTransgressivePluralForm .
+    ?masculineInanimatePastTransgressivePluralForm ontolex:representation ?masculineInanimatePastTransgressivePlural ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q146786, wd:Q12750232 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutPluralPastTransgressiveForm .
-    ?neutPluralPastTransgressiveForm ontolex:representation ?neutPluralPastTransgressive ;
+    ?lexeme ontolex:lexicalForm ?neuterPastTransgressivePluralForm .
+    ?neuterPastTransgressivePluralForm ontolex:representation ?neuterPastTransgressivePlural ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146786, wd:Q12750232 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Dagbani/adverbs/query_adverbs.sparql b/src/scribe_data/language_data_extraction/Dagbani/adverbs/query_adverbs.sparql
index e2e277574..348528412 100644
--- a/src/scribe_data/language_data_extraction/Dagbani/adverbs/query_adverbs.sparql
+++ b/src/scribe_data/language_data_extraction/Dagbani/adverbs/query_adverbs.sparql
@@ -7,9 +7,9 @@ SELECT
   ?adverb
   ?adverbial
   ?plural
-  ?presentTense
+  ?present
   ?adverbialLocation
-  ?pastTense
+  ?past
   ?singular
   ?adverbOfManner
   ?phrase
@@ -33,8 +33,8 @@ WHERE {
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentTenseForm .
-    ?presentTenseForm ontolex:representation ?presentTense ;
+    ?lexeme ontolex:lexicalForm ?presentForm .
+    ?presentForm ontolex:representation ?present ;
       wikibase:grammaticalFeature wd:Q192613 .
   }
 
@@ -45,8 +45,8 @@ WHERE {
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTenseForm .
-    ?pastTenseForm ontolex:representation ?pastTense ;
+    ?lexeme ontolex:lexicalForm ?pastForm .
+    ?pastForm ontolex:representation ?past ;
       wikibase:grammaticalFeature wd:Q1994301 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_1.sparql b/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_1.sparql
index 7d334e768..bae6a9c17 100644
--- a/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_1.sparql
+++ b/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_1.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?commonSingularIndefinite
-  ?neuterSingularIndefinite
+  ?commonIndefiniteSingularPositive
+  ?neuterIndefiniteSingularPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9035 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Indefinite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?commonSingularIndefiniteForm .
-    ?commonSingularIndefiniteForm ontolex:representation ?commonSingularIndefinite ;
+    ?lexeme ontolex:lexicalForm ?commonIndefiniteSingularPositiveForm .
+    ?commonIndefiniteSingularPositiveForm ontolex:representation ?commonIndefiniteSingularPositive ;
       wikibase:grammaticalFeature wd:Q1305037, wd:Q110786, wd:Q53997857, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterSingularIndefiniteForm .
-    ?neuterSingularIndefiniteForm ontolex:representation ?neuterSingularIndefinite ;
+    ?lexeme ontolex:lexicalForm ?neuterIndefiniteSingularPositiveForm .
+    ?neuterIndefiniteSingularPositiveForm ontolex:representation ?neuterIndefiniteSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q53997857, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_2.sparql b/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_2.sparql
index aa47f84dd..695a59fa0 100644
--- a/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_2.sparql
+++ b/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_2.sparql
@@ -17,8 +17,8 @@ WHERE {
   # MARK: Definite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?singularDefiniteForm .
-    ?singularDefiniteForm ontolex:representation ?singularDefinite ;
+    ?lexeme ontolex:lexicalForm ?definiteSingularPositiveForm .
+    ?definiteSingularPositiveForm ontolex:representation ?definiteSingularPositive ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851, wd:Q3482678 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_3.sparql b/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_3.sparql
index 0a4fb0ef3..20669f334 100644
--- a/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_3.sparql
+++ b/src/scribe_data/language_data_extraction/Danish/adjectives/query_adjectives_3.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?indefiniteSuperlative
-  ?definiteSuperlative
+  ?indefiniteSingularSuperlative
+  ?definiteSingularSuperlative
 
 WHERE {
   ?lexeme dct:language wd:Q9035 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Superlative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?indefiniteSuperlativeForm .
-    ?indefiniteSuperlativeFrom ontolex:representation ?indefiniteSuperlative ;
+    ?lexeme ontolex:lexicalForm ?indefiniteSingularSuperlativeForm .
+    ?indefiniteSingularSuperlativeForm ontolex:representation ?indefiniteSingularSuperlative ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997857, wd:Q1817208 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?definiteSuperlativeForm .
-    ?definiteSuperlativeForm ontolex:representation ?definiteSuperlative ;
+    ?lexeme ontolex:lexicalForm ?definiteSingularSuperlativeForm .
+    ?definiteSingularSuperlativeForm ontolex:representation ?definiteSingularSuperlative ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851, wd:Q1817208 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Danish/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Danish/verbs/query_verbs.sparql
index 6fe6a536a..da4336526 100644
--- a/src/scribe_data/language_data_extraction/Danish/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Danish/verbs/query_verbs.sparql
@@ -5,15 +5,15 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?infActive
-  ?presActive
-  ?pretActive
-  ?pastPart
-  ?presPart
+  ?activeInfinitive
+  ?activePresent
+  ?activePreterite
+  ?pastParticiple
+  ?presentParticiple
   ?imperative
-  ?presPassive
-  ?pretPassive
-  ?infPassive
+  ?passivePresent
+  ?passivePreterite
+  ?passiveInfinitive
 
 WHERE {
   # MARK: Infinitive
@@ -25,40 +25,40 @@ WHERE {
   # MARK: Infinitive Active
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infActiveForm .
-    ?infActiveForm ontolex:representation ?infActive ;
+    ?lexeme ontolex:lexicalForm ?activeInfinitiveForm .
+    ?activeInfinitiveForm ontolex:representation ?activeInfinitive ;
       wikibase:grammaticalFeature wd:Q179230, wd:Q1317831 .
   }
 
   # MARK: Present Active
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presActiveForm .
-    ?presActiveForm ontolex:representation ?presActive ;
+    ?lexeme ontolex:lexicalForm ?activePresentForm .
+    ?activePresentForm ontolex:representation ?activePresent ;
       wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 .
   }
 
   # MARK: Preterite Active
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretActiveForm .
-    ?pretActiveForm ontolex:representation ?pretActive ;
+    ?lexeme ontolex:lexicalForm ?activePreteriteForm .
+    ?activePreteriteForm ontolex:representation ?activePreterite ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q1317831 .
   }
 
   # MARK: Past Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastPartForm .
-    ?pastPartForm ontolex:representation ?pastPart ;
+    ?lexeme ontolex:lexicalForm ?pastParticipleForm .
+    ?pastParticipleForm ontolex:representation ?pastParticiple ;
       wikibase:grammaticalFeature wd:Q12717679 .
   }
 
   # MARK: Present Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presPartForm .
-    ?presPartForm ontolex:representation ?presPart ;
+    ?lexeme ontolex:lexicalForm ?presentParticipleForm .
+    ?presentParticipleForm ontolex:representation ?presentParticiple ;
       wikibase:grammaticalFeature wd:Q10345583 .
   }
 
@@ -73,24 +73,24 @@ WHERE {
   # MARK: Present Passive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presPassiveForm .
-    ?presPassiveForm ontolex:representation ?presPassive ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q1194697 .
+    ?lexeme ontolex:lexicalForm ?passivePresentForm .
+    ?passivePresentForm ontolex:representation ?passivePresent ;
+      wikibase:grammaticalFeature wd:Q192613, wd:Q1194697 .
   }
 
   # MARK: Preterite Passive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretPassiveForm .
-    ?pretPassiveForm ontolex:representation ?pretPassive ;
+    ?lexeme ontolex:lexicalForm ?passivePreteriteForm .
+    ?passivePreteriteForm ontolex:representation ?passivePreterite ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q1194697 .
   }
 
   # MARK: Infinitive Passive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infPassiveForm .
-    ?infPassiveForm ontolex:representation ?infPassive ;
+    ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm .
+    ?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ;
       wikibase:grammaticalFeature wd:Q179230, wd:Q1194697 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/English/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/English/verbs/query_verbs.sparql
index 7364beb5d..4b3a226c8 100644
--- a/src/scribe_data/language_data_extraction/English/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/English/verbs/query_verbs.sparql
@@ -5,11 +5,11 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presSimp
-  ?presTPS
-  ?presPart
-  ?pastSimp
-  ?pastPart
+  ?simplePresent
+  ?simplePresentThirdPersonSingular
+  ?presentParticiple
+  ?simplePast
+  ?pastParticiple
 
 WHERE {
   # MARK: Infinitive
@@ -21,56 +21,56 @@ WHERE {
   # MARK: Simple Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSimpForm .
-    ?presSimpForm ontolex:representation ?presSimp ;
-      wikibase:grammaticalFeature wd:Q3910936 ;
-      FILTER NOT EXISTS { ?presSimpForm wikibase:grammaticalFeature wd:Q51929074 . }
-      FILTER NOT EXISTS { ?presSimpForm wdt:P6191 wd:Q181970 . }
-      FILTER NOT EXISTS { ?presSimpForm wikibase:grammaticalFeature wd:Q126473 . }
-      FILTER(LANG(?presSimp) = "en") .
+    ?lexeme ontolex:lexicalForm ?simplePresentForm .
+    ?simplePresentForm ontolex:representation ?simplePresent ;
+      wikibase:grammaticalFeature wd:Q3910936 .
+      FILTER NOT EXISTS { ?simplePresentForm wikibase:grammaticalFeature wd:Q51929074 . }
+      FILTER NOT EXISTS { ?simplePresentForm wdt:P6191 wd:Q181970 . }
+      FILTER NOT EXISTS { ?simplePresentForm wikibase:grammaticalFeature wd:Q126473 . }
+      FILTER(LANG(?simplePresent) = "en")
   }
 
   # MARK: Third-person Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
-      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q3910936 ;
-      FILTER NOT EXISTS { ?presTPSForm wdt:P6191 wd:Q181970 . }
-      FILTER NOT EXISTS { ?presTPSForm wikibase:grammaticalFeature wd:Q126473 . }
-      FILTER(LANG(?presTPS) = "en") .
+    ?lexeme ontolex:lexicalForm ?simplePresentThirdPersonSingularForm .
+    ?simplePresentThirdPersonSingularForm ontolex:representation ?simplePresentThirdPersonSingular ;
+      wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q3910936 .
+      FILTER NOT EXISTS { ?simplePresentThirdPersonSingularForm wdt:P6191 wd:Q181970 . }
+      FILTER NOT EXISTS { ?simplePresentThirdPersonSingularForm wikibase:grammaticalFeature wd:Q126473 . }
+      FILTER(LANG(?simplePresentThirdPersonSingular) = "en")
   }
 
   # MARK: Present Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presPartForm .
-    ?presPartForm ontolex:representation ?presPart ;
-      wikibase:grammaticalFeature wd:Q10345583 ;
-      FILTER NOT EXISTS { ?presPartForm wdt:P6191 wd:Q181970 . }
-      FILTER NOT EXISTS { ?presPartForm wikibase:grammaticalFeature wd:Q126473 . }
-      FILTER(LANG(?presPart) = "en") .
+    ?lexeme ontolex:lexicalForm ?presentParticipleForm .
+    ?presentParticipleForm ontolex:representation ?presentParticiple ;
+      wikibase:grammaticalFeature wd:Q10345583 .
+      FILTER NOT EXISTS { ?presentParticipleForm wdt:P6191 wd:Q181970 . }
+      FILTER NOT EXISTS { ?presentParticipleForm wikibase:grammaticalFeature wd:Q126473 . }
+      FILTER(LANG(?presentParticiple) = "en")
   }
 
   # MARK: Simple Past
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSimpForm .
-    ?pastSimpForm ontolex:representation ?pastSimp ;
-      wikibase:grammaticalFeature wd:Q1392475 ;
-      FILTER NOT EXISTS { ?pastSimpForm wdt:P6191 wd:Q181970 . }
-      FILTER NOT EXISTS { ?pastSimpForm wikibase:grammaticalFeature wd:Q126473 . }
-      FILTER(LANG(?pastSimp) = "en") .
+    ?lexeme ontolex:lexicalForm ?simplePastForm .
+    ?simplePastForm ontolex:representation ?simplePast ;
+      wikibase:grammaticalFeature wd:Q1392475 .
+      FILTER NOT EXISTS { ?simplePastForm wdt:P6191 wd:Q181970 . }
+      FILTER NOT EXISTS { ?simplePastForm wikibase:grammaticalFeature wd:Q126473 . }
+      FILTER(LANG(?simplePast) = "en")
   }
 
   # MARK: Past Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastPartForm .
-    ?pastPartForm ontolex:representation ?pastPart ;
-      wikibase:grammaticalFeature wd:Q1230649 ;
-      FILTER NOT EXISTS { ?pastPartForm wdt:P6191 wd:Q181970 . }
-      FILTER NOT EXISTS { ?pastPartForm wikibase:grammaticalFeature wd:Q126473 . }
-      FILTER(LANG(?pastPart) = "en") .
+    ?lexeme ontolex:lexicalForm ?pastParticipleForm .
+    ?pastParticipleForm ontolex:representation ?pastParticiple ;
+      wikibase:grammaticalFeature wd:Q1230649 .
+      FILTER NOT EXISTS { ?pastParticipleForm wdt:P6191 wd:Q181970 . }
+      FILTER NOT EXISTS { ?pastParticipleForm wikibase:grammaticalFeature wd:Q126473 . }
+      FILTER(LANG(?pastParticiple) = "en")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Esperanto/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Esperanto/adjectives/query_adjectives.sparql
index f2e3c542e..cc83891ef 100644
--- a/src/scribe_data/language_data_extraction/Esperanto/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Esperanto/adjectives/query_adjectives.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q143 ;
     wikibase:lexicalCategory wd:Q34698 ;
     wikibase:lemma ?adjective .
-    FILTER(LANG(?adjective) = "eo") .
+    FILTER(LANG(?adjective) = "eo")
 }
diff --git a/src/scribe_data/language_data_extraction/Esperanto/adverbs/query_adverbs.sparql b/src/scribe_data/language_data_extraction/Esperanto/adverbs/query_adverbs.sparql
index 6fd6e869d..0cb91d265 100644
--- a/src/scribe_data/language_data_extraction/Esperanto/adverbs/query_adverbs.sparql
+++ b/src/scribe_data/language_data_extraction/Esperanto/adverbs/query_adverbs.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q143 ;
     wikibase:lexicalCategory wd:Q380057 ;
     wikibase:lemma ?adverb .
-    FILTER(LANG(?adverb) = "eo") .
+    FILTER(LANG(?adverb) = "eo")
 }
diff --git a/src/scribe_data/language_data_extraction/Esperanto/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Esperanto/nouns/query_nouns.sparql
index 6aa93bbb6..9ad7a9424 100644
--- a/src/scribe_data/language_data_extraction/Esperanto/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Esperanto/nouns/query_nouns.sparql
@@ -4,37 +4,37 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?accSingular
-  ?nomPlural
-  ?accPlural
+  ?nominativeSingular
+  ?accusativeSingular
+  ?nominativePlural
+  ?accusativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q143 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Accusative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?accSingularForm .
-    ?accSingularForm ontolex:representation ?accSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeSingularForm .
+    ?accusativeSingularForm ontolex:representation ?accusativeSingular ;
       wikibase:grammaticalFeature wd:Q146078, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
   # MARK: Accusative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?accPluralForm .
-    ?accPluralForm ontolex:representation ?accPlural ;
+    ?lexeme ontolex:lexicalForm ?accusativePluralForm .
+    ?accusativePluralForm ontolex:representation ?accusativePlural ;
       wikibase:grammaticalFeature wd:Q146078, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Esperanto/personal_pronouns/query_personal_pronouns.sparql b/src/scribe_data/language_data_extraction/Esperanto/personal_pronouns/query_personal_pronouns.sparql
index 8a209a528..a734bbe0f 100644
--- a/src/scribe_data/language_data_extraction/Esperanto/personal_pronouns/query_personal_pronouns.sparql
+++ b/src/scribe_data/language_data_extraction/Esperanto/personal_pronouns/query_personal_pronouns.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q143 ;
     wikibase:lexicalCategory wd:Q468801 ;
     wikibase:lemma ?personalPronouns .
-    FILTER(LANG(?personalPronouns) = "eo") .
+    FILTER(LANG(?personalPronouns) = "eo")
 }
diff --git a/src/scribe_data/language_data_extraction/Esperanto/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Esperanto/proper_nouns/query_proper_nouns.sparql
index 8e8f6dc50..32cc3b03e 100644
--- a/src/scribe_data/language_data_extraction/Esperanto/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Esperanto/proper_nouns/query_proper_nouns.sparql
@@ -4,37 +4,37 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?accSingular
-  ?nomPlural
-  ?accPlural
+  ?nominativeSingular
+  ?accusativeSingular
+  ?nominativePlural
+  ?accusativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q143 ;
     wikibase:lexicalCategory wd:Q147276 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Accusative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?accSingularForm .
-    ?accSingularForm ontolex:representation ?accSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeSingularForm .
+    ?accusativeSingularForm ontolex:representation ?accusativeSingular ;
       wikibase:grammaticalFeature wd:Q146078, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
   # MARK: Accusative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?accPluralForm .
-    ?accPluralForm ontolex:representation ?accPlural ;
+    ?lexeme ontolex:lexicalForm ?accusativePluralForm .
+    ?accusativePluralForm ontolex:representation ?accusativePlural ;
       wikibase:grammaticalFeature wd:Q146078, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Esperanto/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Esperanto/verbs/query_verbs.sparql
index 876df304e..38b86a61b 100644
--- a/src/scribe_data/language_data_extraction/Esperanto/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Esperanto/verbs/query_verbs.sparql
@@ -5,9 +5,9 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presIndicative
-  ?pastIndicative
-  ?futIndicative
+  ?indicativePresent
+  ?indicativePast
+  ?indicativeFuture
   ?conditional
   ?volitive
 
@@ -21,28 +21,28 @@ WHERE {
   # MARK: Present Tense
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presIndicativeForm .
-    ?presIndicativeForm ontolex:representation ?presIndicative ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentForm .
+    ?indicativePresentForm ontolex:representation ?indicativePresent ;
       wikibase:grammaticalFeature wd:Q192613, wd:Q682111 .
-      FILTER(LANG(?presIndicative) = "eo") .
+      FILTER(LANG(?indicativePresent) = "eo")
   }
 
   # MARK: Past Tense
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastIndicativeForm .
-    ?pastIndicativeForm ontolex:representation ?pastIndicative ;
-      wikibase:grammaticalFeature wd:Q1994301, wd:Q682111 ;
-      FILTER(LANG(?pastIndicative) = "eo") .
+    ?lexeme ontolex:lexicalForm ?indicativePastForm .
+    ?indicativePastForm ontolex:representation ?indicativePast ;
+      wikibase:grammaticalFeature wd:Q1994301, wd:Q682111 .
+      FILTER(LANG(?indicativePast) = "eo")
   }
 
   # MARK: Future Tense
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futIndicativeForm .
-    ?futIndicativeForm ontolex:representation ?futIndicative ;
-      wikibase:grammaticalFeature wd:Q501405, wd:Q682111 ;
-      FILTER(LANG(?futIndicative) = "eo") .
+    ?lexeme ontolex:lexicalForm ?indicativeFutureForm .
+    ?indicativeFutureForm ontolex:representation ?indicativeFuture ;
+      wikibase:grammaticalFeature wd:Q501405, wd:Q682111 .
+      FILTER(LANG(?indicativeFuture) = "eo")
   }
 
   # MARK: Conditional
@@ -50,8 +50,8 @@ WHERE {
   OPTIONAL {
     ?lexeme ontolex:lexicalForm ?conditionalForm .
     ?conditionalForm ontolex:representation ?conditional ;
-      wikibase:grammaticalFeature wd:Q625581 ;
-      FILTER(LANG(?conditional) = "eo") .
+      wikibase:grammaticalFeature wd:Q625581 .
+      FILTER(LANG(?conditional) = "eo")
   }
 
   # MARK: Volitive
@@ -59,7 +59,7 @@ WHERE {
   OPTIONAL {
     ?lexeme ontolex:lexicalForm ?volitiveForm .
     ?volitiveForm ontolex:representation ?volitive ;
-      wikibase:grammaticalFeature wd:Q2532941 ;
-      FILTER(LANG(?volitive) = "eo") .
+      wikibase:grammaticalFeature wd:Q2532941 .
+      FILTER(LANG(?volitive) = "eo")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_1.sparql b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_1.sparql
index d6ed6d04c..5e92e85d8 100644
--- a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_1.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_1.sparql
@@ -5,12 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?nomSingular
-  ?nomPlural
-  ?genSingular
-  ?genPlural
-  ?partSingular
-  ?partPlural
+  ?nominativeSingular
+  ?nominativePlural
+  ?genitiveSingular
+  ?genitivePlural
+  ?partitiveSingular
+  ?partitivePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
@@ -20,42 +20,42 @@ WHERE {
   # MARK: Nominative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genSingularForm .
-    ?genSingularForm ontolex:representation ?genSingular ;
+    ?lexeme ontolex:lexicalForm ?genitiveSingularForm .
+    ?genitiveSingularForm ontolex:representation ?genitiveSingular ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genPluralForm .
-    ?genPluralForm ontolex:representation ?genPlural ;
+    ?lexeme ontolex:lexicalForm ?genitivePluralForm .
+    ?genitivePluralForm ontolex:representation ?genitivePlural ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q146786 .
   }
 
   # MARK: Partitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?partSingularForm .
-    ?partSingularForm ontolex:representation ?partSingular ;
+    ?lexeme ontolex:lexicalForm ?partitiveSingularForm .
+    ?partitiveSingularForm ontolex:representation ?partitiveSingular ;
       wikibase:grammaticalFeature wd:Q857325, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?partPluralForm .
-    ?partPluralForm ontolex:representation ?partPlural ;
+    ?lexeme ontolex:lexicalForm ?partitivePluralForm .
+    ?partitivePluralForm ontolex:representation ?partitivePlural ;
       wikibase:grammaticalFeature wd:Q857325, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_2.sparql b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_2.sparql
index d9cb12684..8670f7bcc 100644
--- a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_2.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_2.sparql
@@ -5,14 +5,14 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?illSingular
-  ?illPlural
-  ?ineSingular
-  ?inePlural
-  ?eleSingular
-  ?elePlural
-  ?allSingular
-  ?allPlural
+  ?illativeSingular
+  ?illativePlural
+  ?inessiveSingular
+  ?inessivePlural
+  ?elativeSingular
+  ?elativePlural
+  ?allativeSingular
+  ?allativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
@@ -22,56 +22,56 @@ WHERE {
   # MARK: Illative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?illSingularForm .
-    ?illSingularForm ontolex:representation ?illSingular ;
+    ?lexeme ontolex:lexicalForm ?illativeSingularForm .
+    ?illativeSingularForm ontolex:representation ?illativeSingular ;
       wikibase:grammaticalFeature wd:Q474668, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?illPluralForm .
-    ?illPluralForm ontolex:representation ?illPlural ;
+    ?lexeme ontolex:lexicalForm ?illativePluralForm .
+    ?illativePluralForm ontolex:representation ?illativePlural ;
       wikibase:grammaticalFeature wd:Q474668, wd:Q146786 .
   }
 
   # MARK: Inessive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?ineSingularForm .
-    ?ineSingularForm ontolex:representation ?ineSingular ;
+    ?lexeme ontolex:lexicalForm ?inessiveSingularForm .
+    ?inessiveSingularForm ontolex:representation ?inessiveSingular ;
       wikibase:grammaticalFeature wd:Q282031, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?inePluralForm .
-    ?inePluralForm ontolex:representation ?inePlural ;
+    ?lexeme ontolex:lexicalForm ?inessivePluralForm .
+    ?inessivePluralForm ontolex:representation ?inessivePlural ;
       wikibase:grammaticalFeature wd:Q282031, wd:Q146786 .
   }
 
   # MARK: Elative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?elaSingularForm .
-    ?elaSingularForm ontolex:representation ?elaSingular ;
+    ?lexeme ontolex:lexicalForm ?elativeSingularForm .
+    ?elativeSingularForm ontolex:representation ?elativeSingular ;
       wikibase:grammaticalFeature wd:Q394253, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?elaPluralForm .
-    ?elaPluralForm ontolex:representation ?elaPlural ;
+    ?lexeme ontolex:lexicalForm ?elativePluralForm .
+    ?elativePluralForm ontolex:representation ?elativePlural ;
       wikibase:grammaticalFeature wd:Q394253, wd:Q146786 .
   }
 
   # MARK: Allative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?allSingularForm .
-    ?allSingularForm ontolex:representation ?allSingular ;
+    ?lexeme ontolex:lexicalForm ?allativeSingularForm .
+    ?allativeSingularForm ontolex:representation ?allativeSingular ;
       wikibase:grammaticalFeature wd:Q655020, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?allPluralForm .
-    ?allPluralForm ontolex:representation ?allPlural ;
+    ?lexeme ontolex:lexicalForm ?allativePluralForm .
+    ?allativePluralForm ontolex:representation ?allativePlural ;
       wikibase:grammaticalFeature wd:Q655020, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_3.sparql b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_3.sparql
index ba9948516..7d2864d76 100644
--- a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_3.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_3.sparql
@@ -4,14 +4,14 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?adeSingular
-  ?adePlural
-  ?ablSingular
-  ?ablPlural
-  ?transSingular
-  ?transPlural
-  ?termSingular
-  ?termPlural
+  ?adessiveSingular
+  ?adessivePlural
+  ?ablativeSingular
+  ?ablativePlural
+  ?translativeSingular
+  ?translativePlural
+  ?terminativeSingular
+  ?terminativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
@@ -21,28 +21,28 @@ WHERE {
   # MARK: Adessive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?adeSingularForm .
-    ?adeSingularForm ontolex:representation ?adeSingular ;
+    ?lexeme ontolex:lexicalForm ?adessiveSingularForm .
+    ?adessiveSingularForm ontolex:representation ?adessiveSingular ;
       wikibase:grammaticalFeature wd:Q281954, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?adePluralForm .
-    ?adePluralForm ontolex:representation ?adePlural ;
+    ?lexeme ontolex:lexicalForm ?adessivePluralForm .
+    ?adessivePluralForm ontolex:representation ?adessivePlural ;
       wikibase:grammaticalFeature wd:Q281954, wd:Q146786 .
   }
 
   # MARK: Ablative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?ablSingularForm .
-    ?ablSingularForm ontolex:representation ?ablSingular ;
+    ?lexeme ontolex:lexicalForm ?ablativeSingularForm .
+    ?ablativeSingularForm ontolex:representation ?ablativeSingular ;
       wikibase:grammaticalFeature wd:Q156986, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?ablPluralForm .
-    ?ablPluralForm ontolex:representation ?ablPlural ;
+    ?lexeme ontolex:lexicalForm ?ablativePluralForm .
+    ?ablativePluralForm ontolex:representation ?ablativePlural ;
       wikibase:grammaticalFeature wd:Q156986, wd:Q146786 .
   }
 
@@ -50,28 +50,28 @@ WHERE {
 
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?transSingularForm .
-    ?transSingularForm ontolex:representation ?transSingular ;
+    ?lexeme ontolex:lexicalForm ?translativeSingularForm .
+    ?translativeSingularForm ontolex:representation ?translativeSingular ;
       wikibase:grammaticalFeature wd:Q950170, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?transPluralForm .
-    ?transPluralForm ontolex:representation ?transPlural ;
+    ?lexeme ontolex:lexicalForm ?translativePluralForm .
+    ?translativePluralForm ontolex:representation ?translativePlural ;
       wikibase:grammaticalFeature wd:Q950170, wd:Q146786 .
   }
 
   # MARK: Terminative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?termSingularForm .
-    ?termSingularForm ontolex:representation ?termSingular ;
+    ?lexeme ontolex:lexicalForm ?terminativeSingularForm .
+    ?terminativeSingularForm ontolex:representation ?terminativeSingular ;
       wikibase:grammaticalFeature wd:Q747019, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?termPluralForm .
-    ?termPluralForm ontolex:representation ?termPlural ;
+    ?lexeme ontolex:lexicalForm ?terminativePluralForm .
+    ?terminativePluralForm ontolex:representation ?terminativePlural ;
       wikibase:grammaticalFeature wd:Q747019, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_4.sparql b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_4.sparql
index 9181e7d1a..66f545532 100644
--- a/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_4.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/adjectives/query_adjectives_4.sparql
@@ -4,11 +4,12 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?essPlural
-  ?abeSingular
-  ?abePlural
-  ?comSingular
-  ?comPlural
+  ?essiveSingular
+  ?essivePlural
+  ?abessiveSingular
+  ?abessivePlural
+  ?comitativeSingular
+  ?comitativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
@@ -18,42 +19,42 @@ WHERE {
   # MARK: Essive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?essSingularForm .
-    ?essSingularForm ontolex:representation ?essSingular ;
+    ?lexeme ontolex:lexicalForm ?essiveSingularForm .
+    ?essiveSingularForm ontolex:representation ?essiveSingular ;
       wikibase:grammaticalFeature wd:Q148465, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?essPluralForm .
-    ?essPluralForm ontolex:representation ?essPlural ;
+    ?lexeme ontolex:lexicalForm ?essivePluralForm .
+    ?essivePluralForm ontolex:representation ?essivePlural ;
       wikibase:grammaticalFeature wd:Q148465, wd:Q146786 .
   }
 
   # MARK: Abessive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?abeSingularForm .
-    ?abeSingularForm ontolex:representation ?abeSingular ;
+    ?lexeme ontolex:lexicalForm ?abessiveSingularForm .
+    ?abessiveSingularForm ontolex:representation ?abessiveSingular ;
       wikibase:grammaticalFeature wd:Q319822, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?abePluralForm .
-    ?abePluralForm ontolex:representation ?abePlural ;
+    ?lexeme ontolex:lexicalForm ?abessivePluralForm .
+    ?abessivePluralForm ontolex:representation ?abessivePlural ;
       wikibase:grammaticalFeature wd:Q319822, wd:Q146786 .
   }
 
   # MARK: Comitative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?comSingularForm .
-    ?comSingularForm ontolex:representation ?comSingular ;
+    ?lexeme ontolex:lexicalForm ?comitativeSingularForm .
+    ?comitativeSingularForm ontolex:representation ?comitativeSingular ;
       wikibase:grammaticalFeature wd:Q838581, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?comPluralForm .
-    ?comPluralForm ontolex:representation ?comPlural ;
-      wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
+    ?lexeme ontolex:lexicalForm ?comitativePluralForm .
+    ?comitativePluralForm ontolex:representation ?comitativePlural ;
+      wikibase:grammaticalFeature wd:Q838581, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Estonian/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Estonian/nouns/query_nouns.sparql
index 0ead32fa5..3ae902144 100644
--- a/src/scribe_data/language_data_extraction/Estonian/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/nouns/query_nouns.sparql
@@ -5,7 +5,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?singular
-  ?plural
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
@@ -15,8 +15,8 @@ WHERE {
   # MARK: Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pluralForm .
-    ?pluralForm ontolex:representation ?plural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Estonian/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Estonian/proper_nouns/query_proper_nouns.sparql
index ddc406fe5..215d99803 100644
--- a/src/scribe_data/language_data_extraction/Estonian/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Estonian/proper_nouns/query_proper_nouns.sparql
@@ -5,7 +5,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?singular
-  ?plural
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q9072 ;
@@ -15,8 +15,8 @@ WHERE {
   # MARK: Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pluralForm .
-    ?pluralForm ontolex:representation ?plural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Finnish/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Finnish/nouns/query_nouns.sparql
index c0a6ea142..11c95a44b 100644
--- a/src/scribe_data/language_data_extraction/Finnish/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Finnish/nouns/query_nouns.sparql
@@ -4,19 +4,19 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q1412 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Finnish/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Finnish/proper_nouns/query_proper_nouns.sparql
index ad6889c18..78c6b30ba 100644
--- a/src/scribe_data/language_data_extraction/Finnish/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Finnish/proper_nouns/query_proper_nouns.sparql
@@ -4,19 +4,19 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q1412 ;
     wikibase:lexicalCategory wd:Q147276;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Finnish/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Finnish/verbs/query_verbs.sparql
index 614543ea8..fead64e2c 100644
--- a/src/scribe_data/language_data_extraction/Finnish/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Finnish/verbs/query_verbs.sparql
@@ -5,120 +5,9 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?verb
-  ?infinitiveI
 
 WHERE {
   ?lexeme dct:language wd:Q1412 ;
     wikibase:lexicalCategory wd:Q24905 ;
     wikibase:lemma ?verb .
-
-  # Infinitives
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveIForm .
-    ?infinitiveIForm ontolex:representation ?infinitiveI ;
-      wikibase:grammaticalFeature wd:Q179230 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveIIForm .
-    ?infinitiveIIForm ontolex:representation ?infinitiveII ;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q66596723 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveIIIForm .
-    ?infinitiveIIIForm ontolex:representation ?infinitiveIII ;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q66596786 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveIVForm .
-    ?infinitiveIVForm ontolex:representation ?infinitiveIV ;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q66596828 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitiveVForm .
-    ?infinitiveVForm ontolex:representation ?infinitiveV ;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q66596870 .
-  }
-
-  # Present Indicative
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presIndSg1Form .
-    ?presIndSg1Form ontolex:representation ?presIndSg1 ;
-      wikibase:grammaticalFeature wd:Q192613, wd:Q21714344, wd:Q110786 .
-  }
-
-  # Past Indicative
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastIndSg1Form .
-    ?pastIndSg1Form ontolex:representation ?pastIndSg1 ;
-      wikibase:grammaticalFeature wd:Q1240211, wd:Q21714344, wd:Q110786 .
-  }
-
-  # Conditional
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?conditionalSg1Form .
-    ?conditionalSg1Form ontolex:representation ?conditionalSg1 ;
-      wikibase:grammaticalFeature wd:Q52824793, wd:Q21714344, wd:Q110786 .
-  }
-
-  # Potential
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?potentialSg1Form .
-    ?potentialSg1Form ontolex:representation ?potentialSg1 ;
-      wikibase:grammaticalFeature wd:Q696092, wd:Q21714344, wd:Q110786 .
-  }
-
-  # Imperative
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?imperativeSg2Form .
-    ?imperativeSg2Form ontolex:representation ?imperativeSg2 ;
-      wikibase:grammaticalFeature wd:Q22716, wd:Q51929049, wd:Q110786 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?imperativePl2Form .
-    ?imperativePl2Form ontolex:representation ?imperativePl2 ;
-      wikibase:grammaticalFeature wd:Q22716, wd:Q51929049, wd:Q146786 .
-  }
-
-  # Participles
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?activePresParticipleForm .
-    ?activePresParticipleForm ontolex:representation ?activePresParticiple ;
-      wikibase:grammaticalFeature wd:Q814722, wd:Q1317831 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?activePastParticipleForm .
-    ?activePastParticipleForm ontolex:representation ?activePastParticiple ;
-      wikibase:grammaticalFeature wd:Q12612262, wd:Q1317831 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?passivePresParticipleForm .
-    ?passivePresParticipleForm ontolex:representation ?passivePresParticiple ;
-      wikibase:grammaticalFeature wd:Q814722, wd:Q1194697 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?passivePastParticipleForm .
-    ?passivePastParticipleForm ontolex:representation ?passivePastParticiple ;
-      wikibase:grammaticalFeature wd:Q12612262, wd:Q1194697 .
-  }
-
-  # Passive forms
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?passivePresentForm .
-    ?passivePresentForm ontolex:representation ?passivePresent ;
-      wikibase:grammaticalFeature wd:Q192613, wd:Q1194697 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?passivePastForm .
-    ?passivePastForm ontolex:representation ?passivePast ;
-      wikibase:grammaticalFeature wd:Q1240211, wd:Q1194697 .
-  }
 }
diff --git a/src/scribe_data/language_data_extraction/French/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/French/verbs/query_verbs_1.sparql
index e5f6b281d..0340e80a2 100644
--- a/src/scribe_data/language_data_extraction/French/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/French/verbs/query_verbs_1.sparql
@@ -5,10 +5,18 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
-  ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
+  ?indicativePreteriteFirstPersonSingular
+  ?indicativePreteriteSecondPersonSingular
+  ?indicativePreteriteThirdPersonSingular
+  ?indicativePreteriteFirstPersonPlural
+  ?indicativePreteriteSecondPersonPlural
+  ?indicativePreteriteThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q150 ;
@@ -23,76 +31,76 @@ WHERE {
   # MARK: Indicative Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   # MARK: Indicative Preterite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPSForm .
-    ?pretFPSForm ontolex:representation ?pretFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteFirstPersonSingularForm .
+    ?indicativePreteriteFirstPersonSingularForm ontolex:representation ?indicativePreteriteFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPSForm .
-    ?pretSPSForm ontolex:representation ?pretSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteSecondPersonSingularForm .
+    ?indicativePreteriteSecondPersonSingularForm ontolex:representation ?indicativePreteriteSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPSForm .
-    ?pretTPSForm ontolex:representation ?pretTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteThirdPersonSingularForm .
+    ?indicativePreteriteThirdPersonSingularForm ontolex:representation ?indicativePreteriteThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPPForm .
-    ?pretFPPForm ontolex:representation ?pretFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteFirstPersonPluralForm .
+    ?indicativePreteriteFirstPersonPluralForm ontolex:representation ?indicativePreteriteFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPPForm .
-    ?pretSPPForm ontolex:representation ?pretSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteSecondPersonPluralForm .
+    ?indicativePreteriteSecondPersonPluralForm ontolex:representation ?indicativePreteriteSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPPForm .
-    ?pretTPPForm ontolex:representation ?pretTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteThirdPersonPluralForm .
+    ?indicativePreteriteThirdPersonPluralForm ontolex:representation ?indicativePreteriteThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q442485 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/French/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/French/verbs/query_verbs_2.sparql
index a5f901ecb..b21114424 100644
--- a/src/scribe_data/language_data_extraction/French/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/French/verbs/query_verbs_2.sparql
@@ -5,10 +5,18 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?impFPS ?impSPS ?impTPS
-  ?impFPP ?impSPP ?impTPP
-  ?futFPS ?futSPS ?futTPS
-  ?futFPP ?futSPP ?futTPP
+  ?indicativeImperfectFirstPersonSingular
+  ?indicativeImperfectSecondPersonSingular
+  ?indicativeImperfectThirdPersonSingular
+  ?indicativeImperfectFirstPersonPlural
+  ?indicativeImperfectSecondPersonPlural
+  ?indicativeImperfectThirdPersonPlural
+  ?indicativeSimpleFutureFirstPersonSingular
+  ?indicativeSimpleFutureSecondPersonSingular
+  ?indicativeSimpleFutureThirdPersonSingular
+  ?indicativeSimpleFutureFirstPersonPlural
+  ?indicativeSimpleFutureSecondPersonPlural
+  ?indicativeSimpleFutureThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q150 ;
@@ -23,76 +31,76 @@ WHERE {
   # MARK: Imperfect
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPSForm .
-    ?impFPSForm ontolex:representation ?impFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeImperfectFirstPersonSingularForm .
+    ?indicativeImperfectFirstPersonSingularForm ontolex:representation ?indicativeImperfectFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q108524486 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSForm .
-    ?impSPSForm ontolex:representation ?impSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeImperfectSecondPersonSingularForm .
+    ?indicativeImperfectSecondPersonSingularForm ontolex:representation ?indicativeImperfectSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q108524486 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPSForm .
-    ?impTPSForm ontolex:representation ?impTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeImperfectThirdPersonSingularForm .
+    ?indicativeImperfectThirdPersonSingularForm ontolex:representation ?indicativeImperfectThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q108524486 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPPForm .
-    ?impFPPForm ontolex:representation ?impFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeImperfectFirstPersonPluralForm .
+    ?indicativeImperfectFirstPersonPluralForm ontolex:representation ?indicativeImperfectFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q108524486 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPForm .
-    ?impSPPForm ontolex:representation ?impSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeImperfectSecondPersonPluralForm .
+    ?indicativeImperfectSecondPersonPluralForm ontolex:representation ?indicativeImperfectSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q108524486 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPPForm .
-    ?impTPPForm ontolex:representation ?impTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeImperfectThirdPersonPluralForm .
+    ?indicativeImperfectThirdPersonPluralForm ontolex:representation ?indicativeImperfectThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q108524486 .
   }
 
   # MARK: Future
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futFPSForm .
-    ?futFPSForm ontolex:representation ?futFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeSimpleFutureFirstPersonSingularForm .
+    ?indicativeSimpleFutureFirstPersonSingularForm ontolex:representation ?indicativeSimpleFutureFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q1475560 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futSPSForm .
-    ?futSPSForm ontolex:representation ?futSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeSimpleFutureSecondPersonSingularForm .
+    ?indicativeSimpleFutureSecondPersonSingularForm ontolex:representation ?indicativeSimpleFutureSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q1475560 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futTPSForm .
-    ?futTPSForm ontolex:representation ?futTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativeSimpleFutureThirdPersonSingularForm .
+    ?indicativeSimpleFutureThirdPersonSingularForm ontolex:representation ?indicativeSimpleFutureThirdPersonSingular  ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q1475560 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futFPPForm .
-    ?futFPPForm ontolex:representation ?futFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeSimpleFutureFirstPersonPluralForm .
+    ?indicativeSimpleFutureFirstPersonPluralForm ontolex:representation ?indicativeSimpleFutureFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q1475560 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futSPPForm .
-    ?futSPPForm ontolex:representation ?futSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeSimpleFutureSecondPersonPluralForm .
+    ?indicativeSimpleFutureSecondPersonPluralForm ontolex:representation ?indicativeSimpleFutureSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q1475560 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futTPPForm .
-    ?futTPPForm ontolex:representation ?futTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativeSimpleFutureThirdPersonPluralForm .
+    ?indicativeSimpleFutureThirdPersonPluralForm ontolex:representation ?indicativeSimpleFutureThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q1475560 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/German/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/German/nouns/query_nouns.sparql
index fb2e031fc..70ef2ac04 100644
--- a/src/scribe_data/language_data_extraction/German/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/German/nouns/query_nouns.sparql
@@ -4,20 +4,20 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q188 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q131105 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/German/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/German/proper_nouns/query_proper_nouns.sparql
index 135bed5f8..fef840fba 100644
--- a/src/scribe_data/language_data_extraction/German/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/German/proper_nouns/query_proper_nouns.sparql
@@ -4,13 +4,13 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
+  ?nominativeSingular
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q188 ;
     wikibase:lexicalCategory wd:Q147276 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Gender(s)
 
diff --git a/src/scribe_data/language_data_extraction/German/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/German/verbs/query_verbs_1.sparql
index b5f3755a0..22a4a08c9 100644
--- a/src/scribe_data/language_data_extraction/German/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/German/verbs/query_verbs_1.sparql
@@ -6,8 +6,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q188 ;
@@ -22,33 +26,33 @@ WHERE {
   # MARK: Indicative Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/German/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/German/verbs/query_verbs_2.sparql
index aaa57bc67..92a60b863 100644
--- a/src/scribe_data/language_data_extraction/German/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/German/verbs/query_verbs_2.sparql
@@ -5,9 +5,15 @@
 # Not SELECT as we want to get verbs with both sein and haben as auxiliaries
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?infinitive ?pastParticiple ?auxiliaryVerb
-  ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP
+  ?infinitive
+  ?pastParticiple
+  ?auxiliaryVerb
+  ?indicativePreteriteFirstPersonSingular
+  ?indicativePreteriteSecondPersonSingular
+  ?indicativePreteriteThirdPersonSingular
+  ?indicativePreteriteFirstPersonPlural
+  ?indicativePreteriteSecondPersonPlural
+  ?indicativePreteriteThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q188 ;
@@ -36,33 +42,33 @@ WHERE {
   # MARK: Indicative Preterite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPSForm .
-    ?pretFPSForm ontolex:representation ?pretFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteFirstPersonSingularForm .
+    ?indicativePreteriteFirstPersonSingularForm ontolex:representation ?indicativePreteriteFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q442485 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPSForm .
-    ?pretSPSForm ontolex:representation ?pretSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteSecondPersonSingularForm .
+    ?indicativePreteriteSecondPersonSingularForm ontolex:representation ?indicativePreteriteSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q442485 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPSForm .
-    ?pretTPSForm ontolex:representation ?pretTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteThirdPersonSingularForm .
+    ?indicativePreteriteThirdPersonSingularForm ontolex:representation ?indicativePreteriteThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q442485 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPPForm .
-    ?pretFPPForm ontolex:representation ?pretFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteFirstPersonPluralForm .
+    ?indicativePreteriteFirstPersonPluralForm ontolex:representation ?indicativePreteriteFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q442485 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPPForm .
-    ?pretSPPForm ontolex:representation ?pretSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteSecondPersonPluralForm .
+    ?indicativePreteriteSecondPersonPluralForm ontolex:representation ?indicativePreteriteSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q442485 .
   }
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPPForm .
-    ?pretTPPForm ontolex:representation ?pretTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePreteriteThirdPersonPluralForm .
+    ?indicativePreteriteThirdPersonPluralForm ontolex:representation ?indicativePreteriteThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q442485 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Greek/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Greek/nouns/query_nouns.sparql
index dd9f09425..02e509e8e 100644
--- a/src/scribe_data/language_data_extraction/Greek/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Greek/nouns/query_nouns.sparql
@@ -5,7 +5,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?singular
-  ?plural
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -16,8 +16,8 @@ WHERE {
   # MARK: Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pluralForm .
-    ?pluralForm ontolex:representation ?plural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Greek/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Greek/verbs/query_verbs.sparql
index 85cd94988..4012aabbb 100644
--- a/src/scribe_data/language_data_extraction/Greek/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Greek/verbs/query_verbs.sparql
@@ -5,10 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
-  ?pastFPS ?pastSPS ?pastTPS
-  ?pastFPP ?pastSPP ?pastTPP
+  ?presentFirstPersonSingular
+  ?presentSecondPersonSingular
+  ?presentThirdPersonSingular
+  ?presentFirstPersonPlural
+  ?presentSecondPersonPlural
+  ?presentThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q36510 ;
@@ -23,38 +25,38 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?presentFirstPersonSingularForm .
+    ?presentFirstPersonSingularForm ontolex:representation ?presentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?presentSecondPersonSingularForm .
+    ?presentSecondPersonSingularForm ontolex:representation ?presentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?presentThirdPersonSingularForm .
+    ?presentThirdPersonSingularForm ontolex:representation ?presentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?presentFirstPersonPluralForm .
+    ?presentFirstPersonPluralForm ontolex:representation ?presentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?presentSecondPersonPluralForm .
+    ?presentSecondPersonPluralForm ontolex:representation ?presentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?presentThirdPersonPluralForm .
+    ?presentThirdPersonPluralForm ontolex:representation ?presentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q192613 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql
index b61e9c5c2..aab808508 100644
--- a/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql
@@ -21,7 +21,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "ha") .
+      FILTER(lang(?plural) = "ha")
       # FILTER(lang(?plural) = "ha-arabic")
   }
 
diff --git a/src/scribe_data/language_data_extraction/Hebrew/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Hebrew/adjectives/query_adjectives.sparql
index 1144509c9..317eb4827 100644
--- a/src/scribe_data/language_data_extraction/Hebrew/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Hebrew/adjectives/query_adjectives.sparql
@@ -5,14 +5,14 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?femSingular
-  ?femSingularConstruct
-  ?femPlural
-  ?femPluralConstruct
-  ?masSingular
-  ?masSingularConstruct
-  ?masPlural
-  ?masPluralConstruct
+  ?feminineSingular
+  ?feminineSingularConstruct
+  ?femininePlural
+  ?femininePluralConstruct
+  ?masculineSingular
+  ?masculineSingularConstruct
+  ?masculinePlural
+  ?masculinePluralConstruct
 
 WHERE {
   ?lexeme dct:language wd:Q9288 ;
@@ -23,72 +23,72 @@ WHERE {
   # MARK: Feminine
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularForm .
-    ?femSingularForm ontolex:representation ?femSingular ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularForm .
+    ?feminineSingularForm ontolex:representation ?feminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786 .
     FILTER NOT EXISTS {
-      ?femSingularForm wikibase:grammaticalFeature wd:Q1641446 .
+      ?feminineSingularForm wikibase:grammaticalFeature wd:Q1641446 .
     }
-    FILTER(lang(?femSingular) = "he") .
+    FILTER(lang(?feminineSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularConstructForm .
-    ?femSingularConstructForm ontolex:representation ?femSingularConstruct ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularConstructForm .
+    ?feminineSingularConstructForm ontolex:representation ?feminineSingularConstruct ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q1641446 .
-      FILTER(lang(?femSingularConstruct) = "he") .
+      FILTER(lang(?feminineSingularConstruct) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralForm .
-    ?femPluralForm ontolex:representation ?femPlural ;
+    ?lexeme ontolex:lexicalForm ?femininePluralForm .
+    ?femininePluralForm ontolex:representation ?femininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786 .
     FILTER NOT EXISTS {
-      ?femPluralForm wikibase:grammaticalFeature wd:Q1641446 .
+      ?femininePluralForm wikibase:grammaticalFeature wd:Q1641446 .
     }
-    FILTER(lang(?femPlural) = "he") .
+    FILTER(lang(?femininePlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralConstructForm .
-    ?femPluralConstructForm ontolex:representation ?femPluralConstruct ;
+    ?lexeme ontolex:lexicalForm ?femininePluralConstructForm .
+    ?femininePluralConstructForm ontolex:representation ?femininePluralConstruct ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q1641446 .
-    FILTER(lang(?femPluralConstruct) = "he") .
+    FILTER(lang(?femininePluralConstruct) = "he")
   }
 
   # MARK: Masculine
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularForm .
-    ?masSingularForm ontolex:representation ?masSingular ;
+    ?lexeme ontolex:lexicalForm ?masculineSingularForm .
+    ?masculineSingularForm ontolex:representation ?masculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786 .
     FILTER NOT EXISTS {
-      ?masSingularForm wikibase:grammaticalFeature wd:Q1641446 .
+      ?masculineSingularForm wikibase:grammaticalFeature wd:Q1641446 .
     }
-    FILTER(lang(?masSingular) = "he") .
+    FILTER(lang(?masculineSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularConstructForm .
-    ?masSingularConstructForm ontolex:representation ?masSingularConstruct ;
+    ?lexeme ontolex:lexicalForm ?masculineSingularConstructForm .
+    ?masculineSingularConstructForm ontolex:representation ?masculineSingularConstruct ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q1641446 .
-    FILTER(lang(?masSingularConstruct) = "he") .
+    FILTER(lang(?masculineSingularConstruct) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralForm .
-    ?masPluralForm ontolex:representation ?masPlural ;
+    ?lexeme ontolex:lexicalForm ?masculinePluralForm .
+    ?masculinePluralForm ontolex:representation ?masculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786 .
     FILTER NOT EXISTS {
-      ?masPluralForm wikibase:grammaticalFeature wd:Q1641446 .
+      ?masculinePluralForm wikibase:grammaticalFeature wd:Q1641446 .
     }
-    FILTER(lang(?masPlural) = "he") .
+    FILTER(lang(?masculinePlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralConstructForm .
-    ?masPluralConstructForm ontolex:representation ?masPluralConstruct ;
+    ?lexeme ontolex:lexicalForm ?masculinePluralConstructForm .
+    ?masculinePluralConstructForm ontolex:representation ?masculinePluralConstruct ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q1641446 .
-      FILTER(lang(?masPluralConstruct) = "he") .
+      FILTER(lang(?masculinePluralConstruct) = "he")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hebrew/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Hebrew/nouns/query_nouns.sparql
index f50ac2a39..6578ec433 100644
--- a/src/scribe_data/language_data_extraction/Hebrew/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Hebrew/nouns/query_nouns.sparql
@@ -20,7 +20,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "he") .
+      FILTER(lang(?plural) = "he")
   }
 
   # MARK: Gender(s)
diff --git a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_1.sparql
index dbda6d7b0..73b62a2b6 100644
--- a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_1.sparql
@@ -5,10 +5,10 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presSF
-  ?presSM
-  ?presPF
-  ?presPM
+  ?femininePresentSingular
+  ?masculinePresentSingular
+  ?femininePresentPlural
+  ?masculinePresentPlural
 
 WHERE {
   ?lexeme dct:language wd:Q9288 ;
@@ -19,30 +19,30 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSFForm .
-    ?presSFForm ontolex:representation ?presSF ;
+    ?lexeme ontolex:lexicalForm ?femininePresentSingularForm .
+    ?femininePresentSingularForm ontolex:representation ?femininePresentSingular ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q192613, wd:Q1775415 .
-      FILTER(lang(?presSF) = "he") .
+      FILTER(lang(?femininePresentSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSMForm .
-    ?presSMForm ontolex:representation ?presSM ;
+    ?lexeme ontolex:lexicalForm ?masculinePresentSingularForm .
+    ?masculinePresentSingularForm ontolex:representation ?masculinePresentSingular ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q192613, wd:Q499327 .
-      FILTER(lang(?presSM) = "he") .
+      FILTER(lang(?masculinePresentSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presPFForm .
-    ?presPFForm ontolex:representation ?presPF ;
+    ?lexeme ontolex:lexicalForm ?femininePresentPluralForm .
+    ?femininePresentPluralForm ontolex:representation ?femininePresentPlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q192613, wd:Q1775415 .
-      FILTER(lang(?presPF) = "he") .
+      FILTER(lang(?femininePresentPlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presPMForm .
-    ?presPMForm ontolex:representation ?presPM ;
+    ?lexeme ontolex:lexicalForm ?masculinePresentPluralForm .
+    ?masculinePresentPluralForm ontolex:representation ?masculinePresentPlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q192613, wd:Q499327 .
-      FILTER(lang(?presPM) = "he") .
+      FILTER(lang(?masculinePresentPlural) = "he")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_2.sparql
index 3d9916cec..6a30175f1 100644
--- a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_2.sparql
@@ -5,10 +5,10 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?impSPSF
-  ?impSPSM
-  ?impSPPF
-  ?impSPPM
+  ?feminineImperativeSecondPersonSingular
+  ?masculineImperativeSecondPersonSingular
+  ?feminineImperativeSecondPersonPlural
+  ?masculineImperativeSecondPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q9288 ;
@@ -17,30 +17,30 @@ WHERE {
   # MARK: Imerpative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSMForm .
-    ?impSPSMForm ontolex:representation ?impSPSM ;
+    ?lexeme ontolex:lexicalForm ?feminineImperativeSecondPersonSingularForm .
+    ?feminineImperativeSecondPersonSingularForm ontolex:representation ?feminineImperativeSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q22716, wd:Q1775415 .
-      FILTER(lang(?impSPSM) = "he") .
+      FILTER(lang(?feminineImperativeSecondPersonSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSMForm .
-    ?impSPSMForm ontolex:representation ?impSPSM ;
-      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q22716, wd:Q1775415 .
-      FILTER(lang(?impSPSM) = "he") .
+    ?lexeme ontolex:lexicalForm ?masculineImperativeSecondPersonSingularForm .
+    ?masculineImperativeSecondPersonSingularForm ontolex:representation ?masculineImperativeSecondPersonSingular ;
+      wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q22716, wd:Q499327 .
+      FILTER(lang(?masculineImperativeSecondPersonSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPFForm .
-    ?impSPPFForm ontolex:representation ?impSPPF ;
+    ?lexeme ontolex:lexicalForm ?feminineImperativeSecondPersonPluralForm .
+    ?feminineImperativeSecondPersonPluralForm ontolex:representation ?feminineImperativeSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q22716, wd:Q1775415 .
-      FILTER(lang(?impSPPF) = "he") .
+      FILTER(lang(?feminineImperativeSecondPersonPlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPMForm .
-    ?impSPPMForm ontolex:representation ?impSPPM ;
+    ?lexeme ontolex:lexicalForm ?masculineImperativeSecondPersonPluralForm .
+    ?masculineImperativeSecondPersonPluralForm ontolex:representation ?masculineImperativeSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q22716, wd:Q499327 .
-      FILTER(lang(?impSPPM) = "he") .
+      FILTER(lang(?masculineImperativeSecondPersonPlural) = "he")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_3.sparql b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_3.sparql
index c3498ba97..7cc0b0421 100644
--- a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_3.sparql
+++ b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_3.sparql
@@ -4,16 +4,16 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?pastFPS
-  ?pastSPSF
-  ?pastSPSM
-  ?pastTPSF
-  ?pastTPSM
-  ?pastFPP
-  ?pastSPPF
-  ?pastSPPM
-  ?pastTPPF
-  ?pastTPPM
+  ?pastFirstPersonSingular
+  ?femininePastSecondPersonSingular
+  ?masculinePastSecondPersonSingular
+  ?femininePastThirdPersonSingular
+  ?masculinePastThirdPersonSingular
+  ?pastFirstPersonPlural
+  ?femininePastSecondPersonPlural
+  ?masculinePastSecondPersonPlural
+  ?femininePastThirdPersonPlural
+  ?masculinePastThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q9288 ;
@@ -22,72 +22,72 @@ WHERE {
   # MARK: Past
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPPForm .
-    ?pastTPPForm ontolex:representation ?pastTPP ;
+    ?lexeme ontolex:lexicalForm ?pastFirstPersonSingular .
+    ?pastFirstPersonSingular ontolex:representation ?pastFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q1994301 .
-      FILTER(lang(?pastTPP) = "he") .
+      FILTER(lang(?pastTPP) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPSFForm .
-    ?pastSPSFForm ontolex:representation ?pastSPSF ;
+    ?lexeme ontolex:lexicalForm ?femininePastSecondPersonSingularForm .
+    ?femininePastSecondPersonSingularForm ontolex:representation ?femininePastSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1994301, wd:Q1775415 .
-      FILTER(lang(?pastSPSF) = "he") .
+      FILTER(lang(?femininePastSecondPersonSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPSMForm .
-    ?pastSPSMForm ontolex:representation ?pastSPSM ;
+    ?lexeme ontolex:lexicalForm ?masculinePastSecondPersonSingularForm .
+    ?masculinePastSecondPersonSingularForm ontolex:representation ?masculinePastSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q1994301, wd:Q499327 .
-      FILTER(lang(?pastSPSM) = "he") .
+      FILTER(lang(?masculinePastSecondPersonSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPSFForm .
-    ?pastTPSFForm ontolex:representation ?pastTPSF ;
+    ?lexeme ontolex:lexicalForm ?femininePastThirdPersonSingularForm .
+    ?femininePastThirdPersonSingularForm ontolex:representation ?femininePastThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q1994301, wd:Q1775415 .
-      FILTER(lang(?pastTPSF) = "he") .
+      FILTER(lang(?femininePastThirdPersonSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPSMForm .
-    ?pastTPSMForm ontolex:representation ?pastTPSM ;
+    ?lexeme ontolex:lexicalForm ?masculinePastThirdPersonSingularForm .
+    ?masculinePastThirdPersonSingularForm ontolex:representation ?masculinePastThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q1994301, wd:Q499327 .
-      FILTER(lang(?pastTPSM) = "he") .
+      FILTER(lang(?masculinePastThirdPersonSingular) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastFPPForm .
-    ?pastFPPForm ontolex:representation ?pastFPP ;
+    ?lexeme ontolex:lexicalForm ?pastFirstPersonPluralForm .
+    ?pastFirstPersonPluralForm ontolex:representation ?pastFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q1994301 .
-      FILTER(lang(?pastFPP) = "he") .
+      FILTER(lang(?pastFirstPersonPlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPPFForm .
-    ?pastSPPFForm ontolex:representation ?pastSPPF ;
+    ?lexeme ontolex:lexicalForm ?femininePastSecondPersonPluralForm .
+    ?femininePastSecondPersonPluralForm ontolex:representation ?femininePastSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1994301, wd:Q1775415 .
-      FILTER(lang(?pastSPPF) = "he") .
+      FILTER(lang(?femininePastSecondPersonPlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastSPPMForm .
-    ?pastSPPMForm ontolex:representation ?pastSPPM ;
+    ?lexeme ontolex:lexicalForm ?masculinePastSecondPersonPluralForm .
+    ?masculinePastSecondPersonPluralForm ontolex:representation ?masculinePastSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q1994301, wd:Q499327 .
-      FILTER(lang(?pastSPPM) = "he") .
+      FILTER(lang(?masculinePastSecondPersonPlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPPFForm .
-    ?pastTPPFForm ontolex:representation ?pastTPPF ;
+    ?lexeme ontolex:lexicalForm ?femininePastThirdPersonPluralForm .
+    ?femininePastThirdPersonPluralForm ontolex:representation ?femininePastThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q1994301, wd:Q1775415 .
-      FILTER(lang(?pastTPPF) = "he") .
+      FILTER(lang(?femininePastThirdPersonPlural) = "he")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastTPPMForm .
-    ?pastTPPMForm ontolex:representation ?pastTPPM ;
+    ?lexeme ontolex:lexicalForm ?masculinePastThirdPersonPluralForm .
+    ?masculinePastThirdPersonPluralForm ontolex:representation ?masculinePastThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q1994301, wd:Q499327 .
-      FILTER(lang(?pastTPPM) = "he") .
+      FILTER(lang(?masculinePastThirdPersonPlural) = "he")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_4.sparql b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_4.sparql
index eefaf9f0c..d16276b1b 100644
--- a/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_4.sparql
+++ b/src/scribe_data/language_data_extraction/Hebrew/verbs/query_verbs_4.sparql
@@ -4,8 +4,16 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?futFPS ?futSPSF ?futSPSM ?futTPSF ?futTPSM
-  ?futFPP ?futSPPF ?futSPPM ?futTPPF ?futTPPM
+  ?futureFirstPersonSingular
+  ?feminineFutureSecondPersonSingular
+  ?masculineFutureSecondPersonSingular
+  ?feminineFutureThirdPersonSingular
+  ?masculineFutureThirdPersonSingular
+  ?futureFirstPersonPlural
+  ?feminineFutureSecondPersonPlural
+  ?masculineFutureSecondPersonPlural
+  ?feminineFutureThirdPersonPlural
+  ?masculineFutureThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q9288 ;
@@ -14,72 +22,72 @@ WHERE {
   # MARK: Future
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futFPSForm .
-    ?futFPSForm ontolex:representation ?futFPS ;
+    ?lexeme ontolex:lexicalForm ?futureFirstPersonSingularForm .
+    ?futureFirstPersonSingularForm ontolex:representation ?futureFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q501405 .
-      FILTER(lang(?futFPS) = "he") .
+      FILTER(lang(?futureFirstPersonSingular) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futSPSFForm .
-    ?futSPSFForm ontolex:representation ?futSPSF ;
+    ?lexeme ontolex:lexicalForm ?feminineFutureSecondPersonSingularForm .
+    ?feminineFutureSecondPersonSingularForm ontolex:representation ?feminineFutureSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q501405, wd:Q1775415 .
-      FILTER(lang(?futSPSF) = "he") .
+      FILTER(lang(?feminineFutureSecondPersonSingular) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futSPSMForm .
-    ?futSPSMForm ontolex:representation ?futSPSM ;
+    ?lexeme ontolex:lexicalForm ?masculineFutureSecondPersonSingularForm .
+    ?masculineFutureSecondPersonSingularForm ontolex:representation ?masculineFutureSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q501405, wd:Q499327 .
-      FILTER(lang(?futSPSM) = "he") .
+      FILTER(lang(?masculineFutureSecondPersonSingular) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futTPSFForm .
-    ?futTPSFForm ontolex:representation ?futTPSF ;
+    ?lexeme ontolex:lexicalForm ?feminineFutureThirdPersonSingularForm .
+    ?feminineFutureThirdPersonSingularForm ontolex:representation ?feminineFutureThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q501405, wd:Q1775415 .
-      FILTER(lang(?futTPSF) = "he") .
+      FILTER(lang(?feminineFutureThirdPersonSingular) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futTPSMForm .
-    ?futTPSMForm ontolex:representation ?futTPSM ;
+    ?lexeme ontolex:lexicalForm ?masculineFutureThirdPersonSingularForm .
+    ?masculineFutureThirdPersonSingularForm ontolex:representation ?masculineFutureThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q501405, wd:Q499327 .
-      FILTER(lang(?futTPSM) = "he") .
+      FILTER(lang(?masculineFutureThirdPersonSingular) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futFPPForm .
-    ?futFPPForm ontolex:representation ?futFPP ;
+    ?lexeme ontolex:lexicalForm ?futureFirstPersonPluralForm .
+    ?futureFirstPersonPluralForm ontolex:representation ?futureFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q501405 .
-      FILTER(lang(?futFPP) = "he") .
+      FILTER(lang(?futureFirstPersonPlural) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futSPPFForm .
-    ?futSPPFForm ontolex:representation ?futSPPF ;
+    ?lexeme ontolex:lexicalForm ?feminineFutureSecondPersonPluralForm .
+    ?feminineFutureSecondPersonPluralForm ontolex:representation ?feminineFutureSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q501405, wd:Q1775415 .
-      FILTER(lang(?futSPPF) = "he") .
+      FILTER(lang(?feminineFutureSecondPersonPlural) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futSPPMForm .
-    ?futSPPMForm ontolex:representation ?futSPPM ;
+    ?lexeme ontolex:lexicalForm ?masculineFutureSecondPersonPluralForm .
+    ?masculineFutureSecondPersonPluralForm ontolex:representation ?masculineFutureSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q501405, wd:Q499327 .
-      FILTER(lang(?futSPPM) = "he") .
+      FILTER(lang(?masculineFutureSecondPersonPlural) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futTPPFForm .
-    ?futTPPFForm ontolex:representation ?futTPPF ;
+    ?lexeme ontolex:lexicalForm ?feminineFutureThirdPersonPluralForm .
+    ?feminineFutureThirdPersonPluralForm ontolex:representation ?feminineFutureThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q501405, wd:Q1775415 .
-      FILTER(lang(?futTPPF) = "he") .
+      FILTER(lang(?feminineFutureThirdPersonPlural) = "he") .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futTPPMForm .
-    ?futTPPMForm ontolex:representation ?futTPPM ;
+    ?lexeme ontolex:lexicalForm ?masculineFutureThirdPersonPluralForm .
+    ?masculineFutureThirdPersonPluralForm ontolex:representation ?masculineFutureThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q501405, wd:Q499327 .
-      FILTER(lang(?futTPPM) = "he") .
+      FILTER(lang(?masculineFutureThirdPersonPlural) = "he") .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hindustani/Hindi/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Hindustani/Hindi/adjectives/query_adjectives.sparql
index 88f20249d..1c83b4d13 100644
--- a/src/scribe_data/language_data_extraction/Hindustani/Hindi/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Hindustani/Hindi/adjectives/query_adjectives.sparql
@@ -7,20 +7,20 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?singulativeNumeral
-  ?collectiveNumeral
-  ?femSingularDirect
-  ?masSingularDirect
-  ?femPluralDirect
-  ?masPluralDirect
-  ?femSingularOblique
-  ?masSingularOblique
-  ?femPluralOblique
-  ?masPluralOblique
-  ?femSingularVocative
-  ?masSingularVocative
-  ?femPluralVocative
-  ?masPluralVocative
+  ?singular
+  ?plural
+  ?directFeminineSingular
+  ?directMasculineSingular
+  ?directFemininePlural
+  ?directMasculinePlural
+  ?obliqueFeminineSingular
+  ?obliqueMasculineSingular
+  ?obliqueFemininePlural
+  ?obliqueMasculinePlural
+  ?vocativeFeminineSingular
+  ?vocativeMasculineSingular
+  ?vocativeFemininePlural
+  ?vocativeMasculinePlural
 
 WHERE {
   ?lexeme dct:language wd:Q11051 ;
@@ -31,108 +31,108 @@ WHERE {
   # MARK: Singulative Numeral
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?singulativeNumeralForm .
-    ?singulativeNumeralForm ontolex:representation ?singulativeNumeral ;
+    ?lexeme ontolex:lexicalForm ?singularForm .
+    ?singularForm ontolex:representation ?singular ;
       wikibase:grammaticalFeature wd:Q110786 .
-      FILTER(LANG(?singulativeNumeral) = "hi") .
+      FILTER(LANG(?singular) = "hi")
   }
 
   # MARK: Collective Numeral
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?collectiveNumeralForm .
-    ?collectiveNumeralForm ontolex:representation ?collectiveNumeral ;
+    ?lexeme ontolex:lexicalForm ?pluralForm .
+    ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(LANG(?collectiveNumeral) = "hi") .
+      FILTER(LANG(?plural) = "hi")
   }
 
   # MARK: Direct
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularDirectForm .
-    ?femSingularDirectForm ontolex:representation ?femSingularDirect ;
+    ?lexeme ontolex:lexicalForm ?directFeminineSingularForm .
+    ?directFeminineSingularForm ontolex:representation ?directFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q1751855 .
-      FILTER(LANG(?femSingularDirect) = "hi") .
+      FILTER(LANG(?directFeminineSingular) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularDirectForm .
-    ?masSingularDirectForm ontolex:representation ?masSingularDirect ;
+    ?lexeme ontolex:lexicalForm ?directMasculineSingularForm .
+    ?directMasculineSingularForm ontolex:representation ?directMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q1751855 .
-      FILTER(LANG(?masSingularDirect) = "hi") .
+      FILTER(LANG(?directMasculineSingular) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralDirectForm .
-    ?femPluralDirectForm ontolex:representation ?femPluralDirect ;
+    ?lexeme ontolex:lexicalForm ?directFemininePluralForm .
+    ?directFemininePluralForm ontolex:representation ?directFemininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q1751855 .
-      FILTER(LANG(?femPluralDirect) = "hi") .
+      FILTER(LANG(?directFemininePlural) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralDirectForm .
-    ?masPluralDirectForm ontolex:representation ?masPluralDirect ;
+    ?lexeme ontolex:lexicalForm ?directMasculinePluralForm .
+    ?directMasculinePluralForm ontolex:representation ?directMasculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q1751855 .
-      FILTER(LANG(?masPluralDirect) = "hi") .
+      FILTER(LANG(?directMasculinePlural) = "hi")
   }
 
   # MARK: Oblique
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularObliqueForm .
-    ?femSingularObliqueForm ontolex:representation ?femSingularOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueFeminineSingularForm .
+    ?obliqueFeminineSingularForm ontolex:representation ?obliqueFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q1233197 .
-      FILTER(LANG(?femSingularOblique) = "hi") .
+      FILTER(LANG(?obliqueFeminineSingular) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularObliqueForm .
-    ?masSingularObliqueForm ontolex:representation ?masSingularOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueMasculineSingularForm .
+    ?obliqueMasculineSingularForm ontolex:representation ?obliqueMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q1233197 .
-      FILTER(LANG(?masSingularOblique) = "hi") .
+      FILTER(LANG(?obliqueMasculineSingular) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralObliqueForm .
-    ?femPluralObliqueForm ontolex:representation ?femPluralOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueFemininePluralForm .
+    ?obliqueFemininePluralForm ontolex:representation ?obliqueFemininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q1233197 .
-      FILTER(LANG(?femPluralOblique) = "hi") .
+      FILTER(LANG(?obliqueFemininePlural) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralObliqueForm .
-    ?masPluralObliqueForm ontolex:representation ?masPluralOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueMasculinePluralForm .
+    ?obliqueMasculinePluralForm ontolex:representation ?obliqueMasculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q1233197 .
-      FILTER(LANG(?masPluralOblique) = "hi") .
+      FILTER(LANG(?obliqueMasculinePlural) = "hi")
   }
 
   # MARK: Vocative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularVocativeForm .
-    ?femSingularVocativeForm ontolex:representation ?femSingularVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeFeminineSingularForm .
+    ?vocativeFeminineSingularForm ontolex:representation ?vocativeFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q185077 .
-      FILTER(LANG(?femSingularVocative) = "hi") .
+      FILTER(LANG(?vocativeFeminineSingular) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularVocativeForm .
-    ?masSingularVocativeForm ontolex:representation ?masSingularVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeMasculineSingularForm .
+    ?vocativeMasculineSingularForm ontolex:representation ?vocativeMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q185077 .
-      FILTER(LANG(?masSingularVocative) = "hi") .
+      FILTER(LANG(?vocativeMasculineSingular) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralVocativeForm .
-    ?femPluralVocativeForm ontolex:representation ?femPluralVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeFemininePluralForm .
+    ?vocativeFemininePluralForm ontolex:representation ?vocativeFemininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q185077 .
-      FILTER(LANG(?femPluralVocative) = "hi") .
+      FILTER(LANG(?vocativeFemininePlural) = "hi")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralVocativeForm .
-    ?masPluralVocativeForm ontolex:representation ?masPluralVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeMasculinePluralForm .
+    ?vocativeMasculinePluralForm ontolex:representation ?vocativeMasculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q185077 .
-      FILTER(LANG(?masPluralVocative) = "hi") .
+      FILTER(LANG(?vocativeMasculinePlural) = "hi")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hindustani/Hindi/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Hindustani/Hindi/nouns/query_nouns.sparql
index 527ab94fe..9b1d37a97 100644
--- a/src/scribe_data/language_data_extraction/Hindustani/Hindi/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Hindustani/Hindi/nouns/query_nouns.sparql
@@ -22,7 +22,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "hi") .
+      FILTER(lang(?plural) = "hi")
   }
 
   # MARK: Gender(s)
diff --git a/src/scribe_data/language_data_extraction/Hindustani/Hindi/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Hindustani/Hindi/verbs/query_verbs.sparql
index 058359fa4..9b24cdd3c 100644
--- a/src/scribe_data/language_data_extraction/Hindustani/Hindi/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Hindustani/Hindi/verbs/query_verbs.sparql
@@ -7,16 +7,15 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?directCase
+  ?direct
   ?gerund
   ?intransitivePhase
   ?basicPhase
-  ?conjParticiple
+  ?conjunctiveParticiple
   ?adverbial
-  ?absConstruction
+  ?absoluteConstruction
   ?accusative
-  ?ergative
-  ?additivePhase
+  ?oblique
 
 WHERE {
   # MARK: Infinitive
@@ -24,15 +23,15 @@ WHERE {
   ?lexeme dct:language wd:Q11051 ;
     wikibase:lexicalCategory wd:Q24905 ;
     wikibase:lemma ?infinitive .
-    FILTER(lang(?infinitive) = "hi") .
+    FILTER(lang(?infinitive) = "hi")
 
   # MARK: Direct Case
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?directCaseForm .
-    ?directCaseForm ontolex:representation ?directCase ;
+    ?lexeme ontolex:lexicalForm ?directForm .
+    ?directForm ontolex:representation ?direct ;
       wikibase:grammaticalFeature wd:Q1751855 .
-      FILTER(LANG(?directCase) = "hi") .
+      FILTER(LANG(?direct) = "hi")
   }
 
   # MARK: Gerund
@@ -41,7 +40,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?gerundForm .
     ?gerundForm ontolex:representation ?gerund ;
       wikibase:grammaticalFeature wd:Q1923028 .
-      FILTER(LANG(?gerund) = "hi") .
+      FILTER(LANG(?gerund) = "hi")
   }
 
   # MARK: Intransitive Phase
@@ -50,7 +49,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?intransitivePhaseForm .
     ?intransitivePhaseForm ontolex:representation ?intransitivePhase ;
       wikibase:grammaticalFeature wd:Q113330736 .
-      FILTER(LANG(?intransitivePhase) = "hi") .
+      FILTER(LANG(?intransitivePhase) = "hi")
   }
 
   # MARK: Basic Phase
@@ -59,16 +58,16 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?basicPhaseForm .
     ?basicPhaseForm ontolex:representation ?basicPhase ;
       wikibase:grammaticalFeature wd:Q113330960 .
-      FILTER(LANG(?basicPhase) = "hi") .
+      FILTER(LANG(?basicPhase) = "hi")
   }
 
 # MARK: Conjunctive Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?conjParticipleForm .
-    ?conjParticipleForm ontolex:representation ?conjParticiple ;
+    ?lexeme ontolex:lexicalForm ?conjunctiveParticipleForm .
+    ?conjunctiveParticipleForm ontolex:representation ?conjunctiveParticiple ;
       wikibase:grammaticalFeature wd:Q113133303 .
-      FILTER(LANG(?conjParticiple) = "hi") .
+      FILTER(LANG(?conjunctiveParticiple) = "hi")
   }
 
   # MARK: Adverbial
@@ -77,16 +76,16 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?adverbialForm .
     ?adverbialForm ontolex:representation ?adverbial ;
       wikibase:grammaticalFeature wd:Q380012 .
-      FILTER(LANG(?adverbial) = "hi") .
+      FILTER(LANG(?adverbial) = "hi")
   }
 
   # MARK: Absolute Construction
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?absConstructionForm .
-    ?absConstructionForm ontolex:representation ?absConstruction ;
+    ?lexeme ontolex:lexicalForm ?absoluteConstructionForm .
+    ?absoluteConstructionForm ontolex:representation ?absoluteConstruction ;
       wikibase:grammaticalFeature wd:Q4669807 .
-      FILTER(LANG(?absConstruction) = "hi") .
+      FILTER(LANG(?absoluteConstruction) = "hi")
   }
 
   # MARK: Accusative
@@ -94,16 +93,16 @@ WHERE {
   OPTIONAL {
     ?lexeme ontolex:lexicalForm ?accusativeForm .
     ?accusativeForm ontolex:representation ?accusative ;
-      wikibase:grammaticalFeature wd:Q1233197 .
-      FILTER(LANG(?accusative) = "hi") .
+      wikibase:grammaticalFeature wd:Q146078 .
+      FILTER(LANG(?accusative) = "hi")
   }
 
-  # MARK: Ergative
+  # MARK: Oblique
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?ergativeForm .
-    ?ergativeForm ontolex:representation ?ergative ;
+    ?lexeme ontolex:lexicalForm ?obliqueForm .
+    ?obliqueForm ontolex:representation ?oblique ;
       wikibase:grammaticalFeature wd:Q1233197 .
-      FILTER(LANG(?ergative) = "hi") .
+      FILTER(LANG(?oblique) = "hi")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hindustani/Urdu/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Hindustani/Urdu/adjectives/query_adjectives.sparql
index 110d12812..e4148b310 100644
--- a/src/scribe_data/language_data_extraction/Hindustani/Urdu/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Hindustani/Urdu/adjectives/query_adjectives.sparql
@@ -7,20 +7,20 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?singulativeNumeral
-  ?collectiveNumeral
-  ?femSingularDirect
-  ?masSingularDirect
-  ?femPluralDirect
-  ?masPluralDirect
-  ?femSingularOblique
-  ?masSingularOblique
-  ?femPluralOblique
-  ?masPluralOblique
-  ?femSingularVocative
-  ?masSingularVocative
-  ?femPluralVocative
-  ?masPluralVocative
+  ?singular
+  ?plural
+  ?directFeminineSingular
+  ?directMasculineSingular
+  ?directFemininePlural
+  ?directMasculinePlural
+  ?obliqueFeminineSingular
+  ?obliqueMasculineSingular
+  ?obliqueFemininePlural
+  ?obliqueMasculinePlural
+  ?vocativeFeminineSingular
+  ?vocativeMasculineSingular
+  ?vocativeFemininePlural
+  ?vocativeMasculinePlural
 
 WHERE {
   ?lexeme dct:language wd:Q11051 ;
@@ -31,108 +31,108 @@ WHERE {
   # MARK: Singulative Numeral
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?singulativeNumeralForm .
-    ?singulativeNumeralForm ontolex:representation ?singulativeNumeral ;
+    ?lexeme ontolex:lexicalForm ?singularForm .
+    ?singularForm ontolex:representation ?singular ;
       wikibase:grammaticalFeature wd:Q110786 .
-      FILTER(LANG(?singulativeNumeral) = "ur") .
+      FILTER(LANG(?singular) = "ur")
   }
 
   # MARK: Collective Numeral
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?collectiveNumeralForm .
-    ?collectiveNumeralForm ontolex:representation ?collectiveNumeral ;
+    ?lexeme ontolex:lexicalForm ?pluralForm .
+    ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(LANG(?collectiveNumeral) = "ur") .
+      FILTER(LANG(?plural) = "ur")
   }
 
   # MARK: Direct
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularDirectForm .
-    ?femSingularDirectForm ontolex:representation ?femSingularDirect ;
+    ?lexeme ontolex:lexicalForm ?directFeminineSingularForm .
+    ?directFeminineSingularForm ontolex:representation ?directFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q1751855 .
-      FILTER(LANG(?femSingularDirect) = "ur") .
+      FILTER(LANG(?directFeminineSingular) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularDirectForm .
-    ?masSingularDirectForm ontolex:representation ?masSingularDirect ;
+    ?lexeme ontolex:lexicalForm ?directMasculineSingularForm .
+    ?directMasculineSingularForm ontolex:representation ?directMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q1751855 .
-      FILTER(LANG(?masSingularDirect) = "ur") .
+      FILTER(LANG(?directMasculineSingular) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralDirectForm .
-    ?femPluralDirectForm ontolex:representation ?femPluralDirect ;
+    ?lexeme ontolex:lexicalForm ?directFemininePluralForm .
+    ?directFemininePluralForm ontolex:representation ?directFemininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q1751855 .
-      FILTER(LANG(?femPluralDirect) = "ur") .
+      FILTER(LANG(?directFemininePlural) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralDirectForm .
-    ?masPluralDirectForm ontolex:representation ?masPluralDirect ;
+    ?lexeme ontolex:lexicalForm ?directMasculinePluralForm .
+    ?directMasculinePluralForm ontolex:representation ?directMasculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q1751855 .
-      FILTER(LANG(?masPluralDirect) = "ur") .
+      FILTER(LANG(?directMasculinePlural) = "ur")
   }
 
   # MARK: Oblique
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularObliqueForm .
-    ?femSingularObliqueForm ontolex:representation ?femSingularOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueFeminineSingularForm .
+    ?obliqueFeminineSingularForm ontolex:representation ?obliqueFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q1233197 .
-      FILTER(LANG(?femSingularOblique) = "ur") .
+      FILTER(LANG(?obliqueFeminineSingular) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularObliqueForm .
-    ?masSingularObliqueForm ontolex:representation ?masSingularOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueMasculineSingularForm .
+    ?obliqueMasculineSingularForm ontolex:representation ?obliqueMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q1233197 .
-      FILTER(LANG(?masSingularOblique) = "ur") .
+      FILTER(LANG(?obliqueMasculineSingular) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralObliqueForm .
-    ?femPluralObliqueForm ontolex:representation ?femPluralOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueFemininePluralForm .
+    ?obliqueFemininePluralForm ontolex:representation ?obliqueFemininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q1233197 .
-      FILTER(LANG(?femPluralOblique) = "ur") .
+      FILTER(LANG(?obliqueFemininePlural) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralObliqueForm .
-    ?masPluralObliqueForm ontolex:representation ?masPluralOblique ;
+    ?lexeme ontolex:lexicalForm ?obliqueMasculinePluralForm .
+    ?obliqueMasculinePluralForm ontolex:representation ?obliqueMasculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q1233197 .
-      FILTER(LANG(?masPluralOblique) = "ur") .
+      FILTER(LANG(?obliqueMasculinePlural) = "ur")
   }
 
   # MARK: Vocative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularVocativeForm .
-    ?femSingularVocativeForm ontolex:representation ?femSingularVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeFeminineSingularForm .
+    ?vocativeFeminineSingularForm ontolex:representation ?vocativeFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q185077 .
-      FILTER(LANG(?femSingularVocative) = "ur") .
+      FILTER(LANG(?vocativeFeminineSingular) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularVocativeForm .
-    ?masSingularVocativeForm ontolex:representation ?masSingularVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeMasculineSingularForm .
+    ?vocativeMasculineSingularForm ontolex:representation ?vocativeMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q185077 .
-      FILTER(LANG(?masSingularVocative) = "ur") .
+      FILTER(LANG(?vocativeMasculineSingular) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralVocativeForm .
-    ?femPluralVocativeForm ontolex:representation ?femPluralVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeFemininePluralForm .
+    ?vocativeFemininePluralForm ontolex:representation ?vocativeFemininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q185077 .
-      FILTER(LANG(?femPluralVocative) = "ur") .
+      FILTER(LANG(?vocativeFemininePlural) = "ur")
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralVocativeForm .
-    ?masPluralVocativeForm ontolex:representation ?masPluralVocative ;
+    ?lexeme ontolex:lexicalForm ?vocativeMasculinePluralForm .
+    ?vocativeMasculinePluralForm ontolex:representation ?vocativeMasculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q185077 .
-      FILTER(LANG(?masPluralVocative) = "ur") .
+      FILTER(LANG(?vocativeMasculinePlural) = "ur")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Hindustani/Urdu/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Hindustani/Urdu/nouns/query_nouns.sparql
index ebfa7a646..9d25abb70 100644
--- a/src/scribe_data/language_data_extraction/Hindustani/Urdu/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Hindustani/Urdu/nouns/query_nouns.sparql
@@ -22,7 +22,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "ur") .
+      FILTER(lang(?plural) = "ur")
   }
 
   # MARK: Gender(s)
diff --git a/src/scribe_data/language_data_extraction/Hindustani/Urdu/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Hindustani/Urdu/verbs/query_verbs.sparql
index 233b1b3a4..fd6b9403b 100644
--- a/src/scribe_data/language_data_extraction/Hindustani/Urdu/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Hindustani/Urdu/verbs/query_verbs.sparql
@@ -7,7 +7,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?directCase
+  ?direct
   ?gerund
   ?intransitivePhase
   ?basicPhase
@@ -23,11 +23,11 @@ WHERE {
   # MARK: Direct Case
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?directCaseForm .
-    ?directCaseForm ontolex:representation ?directCase ;
+    ?lexeme ontolex:lexicalForm ?directForm .
+    ?directForm ontolex:representation ?direct ;
       wikibase:grammaticalFeature wd:Q1751855 .
-      FILTER(LANG(?directCase) = "ur") .
-  } 
+      FILTER(LANG(?direct) = "ur")
+  }
 
   # MARK: Gerund
 
@@ -35,8 +35,8 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?gerundForm .
     ?gerundForm ontolex:representation ?gerund ;
       wikibase:grammaticalFeature wd:Q1923028 .
-      FILTER(LANG(?gerund) = "ur") .
-  } 
+      FILTER(LANG(?gerund) = "ur")
+  }
 
   # MARK: Intransitive Phase
 
@@ -44,8 +44,8 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?intransitivePhaseForm .
     ?intransitivePhaseForm ontolex:representation ?intransitivePhase ;
       wikibase:grammaticalFeature wd:Q113330736 .
-      FILTER(LANG(?intransitivePhase) = "ur") .
-  } 
+      FILTER(LANG(?intransitivePhase) = "ur")
+  }
 
   # MARK: Basic Phase
 
@@ -53,6 +53,6 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?basicPhaseForm .
     ?basicPhaseForm ontolex:representation ?basicPhase ;
       wikibase:grammaticalFeature wd:Q113330960 .
-      FILTER(LANG(?basicPhase) = "ur") .
-  } 
+      FILTER(LANG(?basicPhase) = "ur")
+  }
 }
diff --git a/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_1.sparql
index 6fe75830a..cec1a21a2 100644
--- a/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_1.sparql
@@ -5,9 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
-
+  ?presentIndicativeFirstPersonSingular
+  ?presentIndicativeSecondPersonSingular
+  ?presentIndicativeThirdPersonSingular
+  ?presentIndicativeFirstPersonPlural
+  ?presentIndicativeSecondPersonPlural
+  ?presentIndicativeThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q652 ;
@@ -17,76 +20,38 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?presentIndicativeFirstPersonSingularForm .
+    ?presentIndicativeFirstPersonSingularForm ontolex:representation ?presentIndicativeFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q56682909, wd:Q21714344, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?presentIndicativeSecondPersonSingularForm .
+    ?presentIndicativeSecondPersonSingularForm ontolex:representation ?presentIndicativeSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q56682909, wd:Q51929049, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?presentIndicativeThirdPersonSingularForm .
+    ?presentIndicativeThirdPersonSingularForm ontolex:representation ?presentIndicativeThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q56682909, wd:Q51929074, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?presentIndicativeFirstPersonPluralForm .
+    ?presentIndicativeFirstPersonPluralForm ontolex:representation ?presentIndicativeFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q56682909, wd:Q21714344, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?presentIndicativeSecondPersonPluralForm .
+    ?presentIndicativeSecondPersonPluralForm ontolex:representation ?presentIndicativeSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q56682909, wd:Q51929049, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?presentIndicativeThirdPersonPluralForm .
+    ?presentIndicativeThirdPersonPluralForm ontolex:representation ?presentIndicativeThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q56682909, wd:Q51929074, wd:Q146786 .
   }
-
-  # MARK: Preterite
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPSForm .
-    ?pretFPSForm ontolex:representation ?pretFPS ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q51929218 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPSForm .
-    ?pretSPSForm ontolex:representation ?pretSPS ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q51929369 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPSForm .
-    ?pretTPSForm ontolex:representation ?pretTPS ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q51929447 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPPForm .
-    ?pretFPPForm ontolex:representation ?pretFPP ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q51929290 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPPForm .
-    ?pretSPPForm ontolex:representation ?pretSPP ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q51929403 .
-  }
-
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPPForm .
-    ?pretTPPForm ontolex:representation ?pretTPP ;
-      wikibase:grammaticalFeature wd:Q442485, wd:Q51929517 .
-  }
 }
diff --git a/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_2.sparql
index 55760d20e..e9abfb7a4 100644
--- a/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_2.sparql
@@ -5,8 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?impFPS ?impSPS ?impTPS
-  ?impFPP ?impSPP ?impTPP
+  ?pastImperfectFirstPersonSingular
+  ?pastImperfectSecondPersonSingular
+  ?pastImperfectThirdPersonSingular
+  ?pastImperfectFirstPersonPlural
+  ?pastImperfectSecondPersonPlural
+  ?pastImperfectThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q652 ;
@@ -16,38 +20,38 @@ WHERE {
   # MARK: Imperfect
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPSForm .
-    ?impFPSForm ontolex:representation ?impFPS ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectFirstPersonSingularForm .
+    ?pastImperfectFirstPersonSingularForm ontolex:representation ?pastImperfectFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q12547192, wd:Q21714344, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSForm .
-    ?impSPSForm ontolex:representation ?impSPS ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectSecondPersonSingularForm .
+    ?pastImperfectSecondPersonSingularForm ontolex:representation ?pastImperfectSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q12547192, wd:Q51929049, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPSForm .
-    ?impTPSForm ontolex:representation ?impTPS ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectThirdPersonSingularForm .
+    ?pastImperfectThirdPersonSingularForm ontolex:representation ?pastImperfectThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q12547192, wd:Q51929074, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPPForm .
-    ?impFPPForm ontolex:representation ?impFPP ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectFirstPersonPluralForm .
+    ?pastImperfectFirstPersonPluralForm ontolex:representation ?pastImperfectFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q12547192, wd:Q21714344, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPForm .
-    ?impSPPForm ontolex:representation ?impSPP ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectSecondPersonPluralForm .
+    ?pastImperfectSecondPersonPluralForm ontolex:representation ?pastImperfectSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q12547192, wd:Q51929049, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPPForm .
-    ?impTPPForm ontolex:representation ?impTPP ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectThirdPersonPluralForm .
+    ?pastImperfectThirdPersonPluralForm ontolex:representation ?pastImperfectThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q12547192, wd:Q51929074, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_3.sparql b/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_3.sparql
index d838f75a1..1116452c1 100644
--- a/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_3.sparql
+++ b/src/scribe_data/language_data_extraction/Italian/verbs/query_verbs_3.sparql
@@ -6,8 +6,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP
+  ?preteriteFirstPersonSingular
+  ?preteriteSecondPersonSingular
+  ?preteriteThirdPersonSingular
+  ?preteriteFirstPersonPlural
+  ?preteriteSecondPersonPlural
+  ?preteriteThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q652 ;
@@ -17,38 +21,38 @@ WHERE {
   # MARK: Preterite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPSForm .
-    ?pretFPSForm ontolex:representation ?pretFPS ;
+    ?lexeme ontolex:lexicalForm ?preteriteFirstPersonSingularForm .
+    ?preteriteFirstPersonSingularForm ontolex:representation ?preteriteFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q21714344, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPSForm .
-    ?pretSPSForm ontolex:representation ?pretSPS ;
+    ?lexeme ontolex:lexicalForm ?preteriteSecondPersonSingularForm .
+    ?preteriteSecondPersonSingularForm ontolex:representation ?preteriteSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q51929049, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPSForm .
-    ?pretTPSForm ontolex:representation ?pretTPS ;
+    ?lexeme ontolex:lexicalForm ?preteriteThirdPersonSingularForm .
+    ?preteriteThirdPersonSingularForm ontolex:representation ?preteriteThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q51929074, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPPForm .
-    ?pretFPPForm ontolex:representation ?pretFPP ;
+    ?lexeme ontolex:lexicalForm ?preteriteFirstPersonPluralForm .
+    ?preteriteFirstPersonPluralForm ontolex:representation ?preteriteFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q21714344, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPPForm .
-    ?pretSPPForm ontolex:representation ?pretSPP ;
+    ?lexeme ontolex:lexicalForm ?preteriteSecondPersonPluralForm .
+    ?preteriteSecondPersonPluralForm ontolex:representation ?preteriteSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q51929049, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPPForm .
-    ?pretTPPForm ontolex:representation ?pretTPP ;
+    ?lexeme ontolex:lexicalForm ?preteriteThirdPersonPluralForm .
+    ?preteriteThirdPersonPluralForm ontolex:representation ?preteriteThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q442485, wd:Q51929074, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Japanese/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Japanese/verbs/query_verbs.sparql
index 2188603d8..326a37441 100644
--- a/src/scribe_data/language_data_extraction/Japanese/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Japanese/verbs/query_verbs.sparql
@@ -8,7 +8,7 @@ SELECT
   ?negative
   ?conjunctive
   ?imperfective
-  ?atrributive
+  ?attributive
   ?hypothetical
 
 WHERE {
@@ -23,7 +23,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?negativeForm .
     ?negativeForm ontolex:representation ?negative ;
       wikibase:grammaticalFeature wd:Q15737187 .
-      FILTER(LANG(?negative) = "ja-hira") .
+      FILTER(LANG(?negative) = "ja-hira")
   }
 
   # MARK: Conjunctive
@@ -32,7 +32,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?conjunctiveForm .
     ?conjunctiveForm ontolex:representation ?conjunctive ;
       wikibase:grammaticalFeature wd:Q2888577 .
-      FILTER(LANG(?conjunctive) = "ja-hira") .
+      FILTER(LANG(?conjunctive) = "ja-hira")
   }
 
   # MARK: Imperfective
@@ -41,16 +41,16 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?imperfectiveForm .
     ?imperfectiveForm ontolex:representation ?imperfective ;
       wikibase:grammaticalFeature wd:Q2898727 .
-      FILTER(LANG(?imperfective) = "ja-hira") .
+      FILTER(LANG(?imperfective) = "ja-hira")
   }
 
   # MARK: Attributive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?atrributiveForm .
-    ?atrributiveForm ontolex:representation ?atrributive ;
+    ?lexeme ontolex:lexicalForm ?attributiveForm .
+    ?attributiveForm ontolex:representation ?attributive ;
       wikibase:grammaticalFeature wd:Q53608953 .
-      FILTER(LANG(?atrributive) = "ja-hira") .
+      FILTER(LANG(?attributive) = "ja-hira")
   }
 
   # MARK: Hypothetical
@@ -59,6 +59,6 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?hypotheticalForm .
     ?hypotheticalForm ontolex:representation ?hypothetical ;
       wikibase:grammaticalFeature wd:Q53609593 .
-      FILTER(LANG(?hypothetical) = "ja-hira") .
+      FILTER(LANG(?hypothetical) = "ja-hira")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Kurmanji/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Kurmanji/adjectives/query_adjectives.sparql
index c93999c2a..c1d681b5c 100644
--- a/src/scribe_data/language_data_extraction/Kurmanji/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Kurmanji/adjectives/query_adjectives.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q36163 ;
     wikibase:lexicalCategory wd:Q34698 ;
     wikibase:lemma ?adjective .
-    FILTER(lang(?adjective) = "ku") .
+    FILTER(lang(?adjective) = "ku")
 }
diff --git a/src/scribe_data/language_data_extraction/Kurmanji/adverbs/query_adverbs.sparql b/src/scribe_data/language_data_extraction/Kurmanji/adverbs/query_adverbs.sparql
index 78def3dd2..b192b3f61 100644
--- a/src/scribe_data/language_data_extraction/Kurmanji/adverbs/query_adverbs.sparql
+++ b/src/scribe_data/language_data_extraction/Kurmanji/adverbs/query_adverbs.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q36163 ;
     wikibase:lexicalCategory wd:Q380057 ;
     wikibase:lemma ?adverb .
-    FILTER(lang(?adverb) = "ku") .
+    FILTER(lang(?adverb) = "ku")
 }
diff --git a/src/scribe_data/language_data_extraction/Kurmanji/prepositions/query_prepositions.sparql b/src/scribe_data/language_data_extraction/Kurmanji/prepositions/query_prepositions.sparql
index cc2af29f2..934b79c4a 100644
--- a/src/scribe_data/language_data_extraction/Kurmanji/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/language_data_extraction/Kurmanji/prepositions/query_prepositions.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q36163 ;
     wikibase:lexicalCategory wd:Q4833830 ;
     wikibase:lemma ?preposition .
-    FILTER(lang(?preposition) = "ku") .
+    FILTER(lang(?preposition) = "ku")
 }
diff --git a/src/scribe_data/language_data_extraction/Kurmanji/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Kurmanji/verbs/query_verbs.sparql
index be698e246..63267846a 100644
--- a/src/scribe_data/language_data_extraction/Kurmanji/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Kurmanji/verbs/query_verbs.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q36163 ;
     wikibase:lexicalCategory wd:Q24905 ;
     wikibase:lemma ?verb .
-    FILTER(lang(?verb) = "ku") .
+    FILTER(lang(?verb) = "ku")
 }
diff --git a/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_1.sparql b/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_1.sparql
index d0f0c0ed6..3dd06a5b7 100644
--- a/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_1.sparql
+++ b/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_1.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q397 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Nominative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_2.sparql b/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_2.sparql
index c93f03951..96c179a6a 100644
--- a/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_2.sparql
+++ b/src/scribe_data/language_data_extraction/Latin/adjectives/query_adjectives_2.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?genSingular
-  ?genPlural
+  ?genitiveSingular
+  ?genitivePlural
 
 WHERE {
   ?lexeme dct:language wd:Q397 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genSingularForm .
-    ?genSingularForm ontolex:representation ?genSingular ;
+    ?lexeme ontolex:lexicalForm ?genitiveSingularForm .
+    ?genitiveSingularForm ontolex:representation ?genitiveSingular ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genPluralForm .
-    ?genPluralForm ontolex:representation ?genPlural ;
+    ?lexeme ontolex:lexicalForm ?genitivePluralForm .
+    ?genitivePluralForm ontolex:representation ?genitivePlural ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_1.sparql b/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_1.sparql
index 8c3362747..aabc09a75 100644
--- a/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_1.sparql
+++ b/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_1.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?noun
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q397 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Nominative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_2.sparql b/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_2.sparql
index b4108afa8..d1d9757bd 100644
--- a/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_2.sparql
+++ b/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_2.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?noun
-  ?genSingular
-  ?genPlural
+  ?genitiveSingular
+  ?genitivePlural
 
 WHERE {
   ?lexeme dct:language wd:Q397 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genSingularForm .
-    ?genSingularForm ontolex:representation ?genSingular ;
+    ?lexeme ontolex:lexicalForm ?genitiveSingularForm .
+    ?genitiveSingularForm ontolex:representation ?genitiveSingular ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genPluralForm .
-    ?genPluralForm ontolex:representation ?genPlural ;
+    ?lexeme ontolex:lexicalForm ?genitivePluralForm .
+    ?genitivePluralForm ontolex:representation ?genitivePlural ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_3.sparql b/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_3.sparql
index 2c8071ad5..e93bd6163 100644
--- a/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_3.sparql
+++ b/src/scribe_data/language_data_extraction/Latin/nouns/query_nouns_3.sparql
@@ -5,8 +5,8 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?noun
-  ?ablSingular
-  ?ablPlural
+  ?ablativeSingular
+  ?ablativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q397 ;
@@ -16,14 +16,14 @@ WHERE {
   # MARK: Ablative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?ablSingularForm .
-    ?ablSingularForm ontolex:representation ?ablSingular ;
+    ?lexeme ontolex:lexicalForm ?ablativeSingularForm .
+    ?ablativeSingularForm ontolex:representation ?ablativeSingular ;
       wikibase:grammaticalFeature wd:Q156986, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?ablPluralForm .
-    ?ablPluralForm ontolex:representation ?ablPlural ;
+    ?lexeme ontolex:lexicalForm ?ablativePluralForm .
+    ?ablativePluralForm ontolex:representation ?ablativePlural ;
       wikibase:grammaticalFeature wd:Q156986, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Malayalam/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Malayalam/nouns/query_nouns.sparql
index 1a01c1313..bb00a51ca 100644
--- a/src/scribe_data/language_data_extraction/Malayalam/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Malayalam/nouns/query_nouns.sparql
@@ -4,13 +4,13 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
+  ?nominativeSingular
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q36236 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Gender(s)
 
diff --git a/src/scribe_data/language_data_extraction/Malayalam/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Malayalam/proper_nouns/query_proper_nouns.sparql
index 071133a28..b8d830057 100644
--- a/src/scribe_data/language_data_extraction/Malayalam/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Malayalam/proper_nouns/query_proper_nouns.sparql
@@ -4,13 +4,13 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
+  ?nominativeSingular
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q36236 ;
     wikibase:lexicalCategory wd:Q147276 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Gender(s)
 
diff --git a/src/scribe_data/language_data_extraction/Malayalam/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Malayalam/verbs/query_verbs.sparql
index 8fc6ac004..9a49e67a0 100644
--- a/src/scribe_data/language_data_extraction/Malayalam/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Malayalam/verbs/query_verbs.sparql
@@ -18,10 +18,10 @@ WHERE {
   # MARK: Present Infinitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentInfForm .
-    ?presentInfForm ontolex:representation ?presentInfinitive ;
+    ?lexeme ontolex:lexicalForm ?presentInfinitiveForm .
+    ?presentInfinitiveForm ontolex:representation ?presentInfinitive ;
       wikibase:grammaticalFeature wd:Q52434245 .
-      FILTER(LANG(?presentInfinitive) = "ml") .
+      FILTER(LANG(?presentInfinitive) = "ml")
   }
 
   # MARK: Simple Present
@@ -30,7 +30,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?simplePresentForm .
     ?simplePresentForm ontolex:representation ?simplePresent ;
       wikibase:grammaticalFeature wd:Q3910936 .
-      FILTER(LANG(?simplePresent) = "ml") .
+      FILTER(LANG(?simplePresent) = "ml")
   }
 
   # MARK: Simple Past
@@ -39,7 +39,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?simplePastForm .
     ?simplePastForm ontolex:representation ?simplePast ;
       wikibase:grammaticalFeature wd:Q1392475 .
-      FILTER(LANG(?simplePast) = "ml") .
+      FILTER(LANG(?simplePast) = "ml")
   }
 
   # MARK: Simple Future
@@ -48,6 +48,6 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?simpleFutureForm .
     ?simpleFutureForm ontolex:representation ?simpleFuture ;
       wikibase:grammaticalFeature wd:Q1475560 .
-      FILTER(LANG(?simpleFuture) = "ml") .
+      FILTER(LANG(?simpleFuture) = "ml")
   }
 }
diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/nouns/query_nouns.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/nouns/query_nouns.sparql"
index e915167dc..751e9f3ef 100644
--- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/nouns/query_nouns.sparql"
+++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/nouns/query_nouns.sparql"
@@ -6,38 +6,38 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?indefSingular
-  ?defSingular
-  ?indefPlural
-  ?defPlural
+  ?indefiniteSingular
+  ?definiteSingular
+  ?indefinitePlural
+  ?definitePlural
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q25167 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?indefSingular .
+    wikibase:lemma ?indefiniteSingular .
 
   # MARK: Definite Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?defSingularForm .
-    ?defSingularForm ontolex:representation ?defSingular ;
+    ?lexeme ontolex:lexicalForm ?definiteSingularForm .
+    ?definiteSingularForm ontolex:representation ?definiteSingular ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851 .
   }
 
   # MARK: Indefinite Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?indefPluralForm .
-    ?indefPluralForm ontolex:representation ?indefPlural ;
+    ?lexeme ontolex:lexicalForm ?indefinitePluralForm .
+    ?indefinitePluralForm ontolex:representation ?indefinitePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q53997857 .
   }
 
   # MARK: Definite Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?defPluralForm .
-    ?defPluralForm ontolex:representation ?defPlural ;
+    ?lexeme ontolex:lexicalForm ?definitePluralForm .
+    ?definitePluralForm ontolex:representation ?definitePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q53997851 .
   }
 
diff --git "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql" "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql"
index d61ac04b1..ab75cdb42 100644
--- "a/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql"
+++ "b/src/scribe_data/language_data_extraction/Norwegian/Bokm\303\245l/verbs/query_verbs.sparql"
@@ -7,7 +7,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?present
+  ?activePresent
 
 WHERE {
   ?lexeme dct:language wd:Q25167 ;
@@ -22,8 +22,8 @@ WHERE {
   # MARK: Active Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentForm .
-    ?presentForm ontolex:representation ?present ;
+    ?lexeme ontolex:lexicalForm ?activePresentForm .
+    ?activePresentForm ontolex:representation ?activePresent ;
       wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/adjectives/query_adjectives.sparql
index 1b72d7048..906c7c8be 100644
--- a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/adjectives/query_adjectives.sparql
@@ -7,9 +7,9 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?commonSingularIndefinite
-  ?neuterSingularIndefinite
-  ?singularDefinite
+  ?feminineMasculineIndefiniteSingular
+  ?neuterIndefiniteSingular
+  ?definiteSingular
   ?plural
 
 
@@ -21,24 +21,24 @@ WHERE {
   # MARK: Common Indefinite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?commonSingularIndefiniteForm .
-    ?commonSingularIndefiniteForm ontolex:representation ?commonSingularIndefinite ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q499327, wd:Q110786, wd:Q53997857.
+    ?lexeme ontolex:lexicalForm ?feminineMasculineIndefiniteSingularForm .
+    ?feminineMasculineIndefiniteSingularForm ontolex:representation ?feminineMasculineIndefiniteSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q499327, wd:Q110786, wd:Q53997857 .
   }
 
   # MARK: Neuter Indefinite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterSingularIndefiniteForm .
-    ?neuterSingularIndefiniteForm ontolex:representation ?neuterSingularIndefinite ;
+    ?lexeme ontolex:lexicalForm ?neuterIndefiniteSingularForm .
+    ?neuterIndefiniteSingularForm ontolex:representation ?neuterIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q53997857 .
   }
 
   # MARK: Definite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?singularDefiniteForm .
-    ?singularDefiniteForm ontolex:representation ?singularDefinite ;
+    ?lexeme ontolex:lexicalForm ?definiteSingularForm .
+    ?definiteSingularForm ontolex:representation ?definiteSingular ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/nouns/query_nouns.sparql
index 412453f01..beeb5d364 100644
--- a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/nouns/query_nouns.sparql
@@ -6,38 +6,38 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?indefSingular
-  ?defSingular
-  ?indefPlural
-  ?defPlural
+  ?indefiniteSingular
+  ?definiteSingular
+  ?indefinitePlural
+  ?definitePlural
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q25164 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?indefSingular .
+    wikibase:lemma ?indefiniteSingular .
 
   # MARK: Definite Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?defSingularForm .
-    ?defSingularForm ontolex:representation ?defSingular ;
+    ?lexeme ontolex:lexicalForm ?definiteSingularForm .
+    ?definiteSingularForm ontolex:representation ?definiteSingular ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851 .
   }
 
   # MARK: Indefinite Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?indefPluralForm .
-    ?indefPluralForm ontolex:representation ?indefPlural ;
+    ?lexeme ontolex:lexicalForm ?indefinitePluralForm .
+    ?indefinitePluralForm ontolex:representation ?indefinitePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q53997857 .
   }
 
   # MARK: Definite Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?defPluralForm .
-    ?defPluralForm ontolex:representation ?defPlural ;
+    ?lexeme ontolex:lexicalForm ?definitePluralForm .
+    ?definitePluralForm ontolex:representation ?definitePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q53997851 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/proper_nouns/query_proper_nouns.sparql
index 93d07101c..b8f61e4bf 100644
--- a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/proper_nouns/query_proper_nouns.sparql
@@ -6,38 +6,38 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?indefSingular
-  ?defSingular
-  ?indefPlural
-  ?defPlural
+  ?indefiniteSingular
+  ?definiteSingular
+  ?indefinitePlural
+  ?definitePlural
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q25164 ;
     wikibase:lexicalCategory wd:Q147276;
-    wikibase:lemma ?indefSingular .
+    wikibase:lemma ?indefiniteSingular .
 
   # MARK: Definite Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?  ?defSingularForm .
-    ?defSingularForm ontolex:representation ?defSingular ;
+    ?lexeme ontolex:lexicalForm ?  ?definiteSingularForm .
+    ?definiteSingularForm ontolex:representation ?definiteSingular ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851 .
   }
 
   # MARK: Indefinite Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?indefPluralForm .
-    ?indefPluralForm ontolex:representation ?indefPlural ;
+    ?lexeme ontolex:lexicalForm ?indefinitePluralForm .
+    ?indefinitePluralForm ontolex:representation ?indefinitePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q53997857 .
   }
 
   # MARK: Definite Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?defPluralForm .
-    ?defPluralForm ontolex:representation ?defPlural ;
+    ?lexeme ontolex:lexicalForm ?definitePluralForm .
+    ?definitePluralForm ontolex:representation ?definitePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q53997851 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/verbs/query_verbs.sparql
index 56dab2efb..60c40afaa 100644
--- a/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Norwegian/Nynorsk/verbs/query_verbs.sparql
@@ -7,19 +7,19 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?aInfinitiveActive
-  ?eInfinitiveActive
-  ?presentActive
+  ?activeAInfinitive
+  ?activeEInfinitive
+  ?activePresent
   ?preterite
   ?presentPreteritePerfect
   ?imperative
-  ?genderedSingularIndefinitePastParticiple
-  ?neuterSingularIndefinitePastParticiple
-  ?singularDefinitePastParticiple
+  ?feminineMasculineIndefiniteSingularPastParticiple
+  ?neuterIndefiniteSingularPastParticiple
+  ?definiteSingularPastParticiple
   ?pluralPastParticiple
   ?presentParticiple
-  ?infinitivePassive
-  ?presentPassive
+  ?passiveInfinitive
+  ?passivePresent
 
 WHERE {
   # MARK: Infinitive
@@ -27,33 +27,33 @@ WHERE {
   ?lexeme dct:language wd:Q25164 ;
     wikibase:lexicalCategory wd:Q24905 ;
     wikibase:lemma ?infinitive .
-    FILTER(LANG(?infinitive) = "nn") .
+    FILTER(LANG(?infinitive) = "nn")
 
   # MARK: Active A Infinitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?aInfinitiveActiveForm .
-    ?aInfinitiveActiveForm ontolex:representation ?aInfinitiveActive ;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q1317831, wd:Q115223950 .
-      FILTER(LANG(?aInfinitiveActive) = "nn") .
+    ?lexeme ontolex:lexicalForm ?activeAInfinitiveForm .
+    ?activeAInfinitiveForm ontolex:representation ?activeAInfinitive ;
+      wikibase:grammaticalFeature wd:Q1317831, wd:Q115223950 .
+      FILTER(LANG(?activeAInfinitive) = "nn")
   }
 
   # MARK: Active E Infinitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?eInfinitiveActiveForm .
-    ?eInfinitiveActiveForm ontolex:representation ?eInfinitiveActive ;
-      wikibase:grammaticalFeature wd:Q179230, wd:Q1317831, wd:Q115223951 .
-      FILTER(LANG(?eInfinitiveActive) = "nn") .
+    ?lexeme ontolex:lexicalForm ?activeEInfinitiveForm .
+    ?activeEInfinitiveForm ontolex:representation ?activeEInfinitive ;
+      wikibase:grammaticalFeature wd:Q1317831, wd:Q115223951 .
+      FILTER(LANG(?activeEInfinitive) = "nn")
   }
 
   # MARK: Present Tense Active
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentActiveForm .
-    ?presentActiveForm ontolex:representation ?presentActive ;
+    ?lexeme ontolex:lexicalForm ?activePresentForm .
+    ?activePresentForm ontolex:representation ?activePresent ;
       wikibase:grammaticalFeature wd:Q192613, wd:Q1317831 .
-      FILTER(LANG(?presentActive) = "nn") .
+      FILTER(LANG(?activePresent) = "nn")
   }
 
   # MARK: Preterite
@@ -62,7 +62,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?preteriteForm .
     ?preteriteForm ontolex:representation ?preterite ;
       wikibase:grammaticalFeature wd:Q442485 .
-      FILTER(LANG(?preterite) = "nn") .
+      FILTER(LANG(?preterite) = "nn")
 
     FILTER NOT EXISTS {
       ?preteriteForm wikibase:grammaticalFeature wd:Q192613 .  # Present tense
@@ -76,7 +76,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?presentPreteritePerfectForm .
     ?presentPreteritePerfectForm ontolex:representation ?presentPreteritePerfect ;
       wikibase:grammaticalFeature wd:Q192613, wd:Q442485, wd:Q625420 .
-      FILTER(LANG(?presentPreteritePerfect) = "nn") .
+      FILTER(LANG(?presentPreteritePerfect) = "nn")
   }
 
   # MARK: Imperative
@@ -85,34 +85,34 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?imperativeForm .
     ?imperativeForm ontolex:representation ?imperative ;
       wikibase:grammaticalFeature wd:Q22716 .
-      FILTER(LANG(?imperative) = "nn") .
+      FILTER(LANG(?imperative) = "nn")
   }
 
   # MARK: Masculine/Feminine Singular Indefinite Past Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genderedSingularIndefinitePastParticipleForm .
-    ?genderedSingularIndefinitePastParticipleForm ontolex:representation ?genderedSingularIndefinitePastParticiple ;
+    ?lexeme ontolex:lexicalForm ?feminineMasculineIndefiniteSingularPastParticipleForm .
+    ?feminineMasculineIndefiniteSingularPastParticipleForm ontolex:representation ?feminineMasculineIndefiniteSingularPastParticiple ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q1775415, wd:Q110786, wd:Q53997857, wd:Q12717679 .
-      FILTER(LANG(?genderedSingularIndefinitePastParticiple) = "nn") .
+      FILTER(LANG(?feminineMasculineIndefiniteSingularPastParticiple) = "nn")
   }
 
   # MARK: Neuter Singular Indefinite Past Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterSingularIndefinitePastParticipleForm .
-    ?neuterSingularIndefinitePastParticipleForm ontolex:representation ?neuterSingularIndefinitePastParticiple ;
+    ?lexeme ontolex:lexicalForm ?neuterIndefiniteSingularPastParticipleForm .
+    ?neuterIndefiniteSingularPastParticipleForm ontolex:representation ?neuterIndefiniteSingularPastParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q53997857, wd:Q12717679 .
-      FILTER(LANG(?neuterSingularIndefinitePastParticiple) = "nn") .
+      FILTER(LANG(?neuterIndefiniteSingularPastParticiple) = "nn")
   }
 
   # MARK: Singular Definitive Past Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?singularDefinitePastParticipleForm .
-    ?singularDefinitePastParticipleForm ontolex:representation ?singularDefinitePastParticiple ;
+    ?lexeme ontolex:lexicalForm ?definiteSingularPastParticipleForm .
+    ?definiteSingularPastParticipleForm ontolex:representation ?definiteSingularPastParticiple ;
       wikibase:grammaticalFeature wd:Q110786, wd:Q53997851, wd:Q12717679 .
-      FILTER(LANG(?singularDefinitePastParticiple) = "nn") .
+      FILTER(LANG(?definiteSingularPastParticiple) = "nn")
   }
 
   # MARK: Plural Past Participle
@@ -121,7 +121,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralPastParticipleForm .
     ?pluralPastParticipleForm ontolex:representation ?pluralPastParticiple ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q12717679 .
-      FILTER(LANG(?pluralPastParticiple) = "nn") .
+      FILTER(LANG(?pluralPastParticiple) = "nn")
   }
 
   # MARK: Present Participle
@@ -130,24 +130,24 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?presentParticipleForm .
     ?presentParticipleForm ontolex:representation ?presentParticiple ;
       wikibase:grammaticalFeature wd:Q10345583 .
-      FILTER(LANG(?presentParticiple) = "nn") .
+      FILTER(LANG(?presentParticiple) = "nn")
   }
 
   # MARK: Infinitive Passive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?infinitivePassiveForm .
-    ?infinitivePassiveForm ontolex:representation ?infinitivePassive ;
+    ?lexeme ontolex:lexicalForm ?passiveInfinitiveForm .
+    ?passiveInfinitiveForm ontolex:representation ?passiveInfinitive ;
       wikibase:grammaticalFeature wd:Q179230, wd:Q1194697 .
-      FILTER(LANG(?infinitivePassive) = "nn") .
+      FILTER(LANG(?passiveInfinitive) = "nn")
   }
 
   # MARK: Present Passive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presentPassiveForm .
-    ?presentPassiveForm ontolex:representation ?presentPassive ;
+    ?lexeme ontolex:lexicalForm ?passivePresentForm .
+    ?passivePresentForm ontolex:representation ?passivePresent ;
       wikibase:grammaticalFeature wd:Q192613, wd:Q1194697 .
-      FILTER(LANG(?presentPassive) = "nn") .
+      FILTER(LANG(?passivePresent) = "nn")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Polish/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Polish/nouns/query_nouns.sparql
index 918035596..ecbd945d3 100644
--- a/src/scribe_data/language_data_extraction/Polish/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Polish/nouns/query_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -15,16 +15,16 @@ WHERE {
   # MARK: Nominative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Polish/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Polish/proper_nouns/query_proper_nouns.sparql
index 40f0e6883..1c0091615 100644
--- a/src/scribe_data/language_data_extraction/Polish/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Polish/proper_nouns/query_proper_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -15,16 +15,16 @@ WHERE {
   # MARK: Nominative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Polish/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Polish/verbs/query_verbs.sparql
index b92a782b8..60749242f 100644
--- a/src/scribe_data/language_data_extraction/Polish/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Polish/verbs/query_verbs.sparql
@@ -5,28 +5,28 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS
-  ?presSPS
-  ?presTPS
-  ?presFPP
-  ?presSPP
-  ?presTPP
-  ?femSingActivePart
-  ?masAnimateSingActivePart
-  ?masInanimateSingActivePart
-  ?neutSingActivePart
-  ?femPluralActivePart
-  ?masAnimatePluralActivePart
-  ?masInanimatePluralActivePart
-  ?neutPluralActivePart
-  ?femSingPassivePart
-  ?masAnimateSingPassivePart
-  ?masInanimateSingPassivePart
-  ?neutSingPassivePart
-  ?femPluralPassivePart
-  ?masAnimatePluralPassivePart
-  ?masInanimatePluralPassivePart
-  ?neutPluralPassivePart
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
+  ?feminineSingularActiveParticiple
+  ?masculineAnimateSingularActiveParticiple
+  ?masculineInanimateSingularActiveParticiple
+  ?neuterSingularActiveParticiple
+  ?femininePluralActiveParticiple
+  ?masculineAnimatePluralActiveParticiple
+  ?masculineInanimatePluralActiveParticiple
+  ?neuterPluralActiveParticiple
+  ?feminineSingularPassiveParticiple
+  ?masculineAnimateSingularPassiveParticiple
+  ?masculineInanimateSingularPassiveParticiple
+  ?neuterSingularPassiveParticiple
+  ?femininePluralPassiveParticiple
+  ?masculineAnimatePluralPassiveParticiple
+  ?masculineInanimatePluralPassiveParticiple
+  ?neuterPluralPassiveParticiple
 
 WHERE {
   ?lexeme dct:language wd:Q809 ;
@@ -36,138 +36,138 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q192613, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q192613, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q192613, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q192613, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q192613, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q192613, wd:Q682111 .
   }
 
   # MARK: Active Participle
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingActivePartForm .
-    ?femSingActivePartForm ontolex:representation ?femSingActivePart ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularActiveParticipleForm .
+    ?feminineSingularActiveParticipleForm ontolex:representation ?feminineSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimateSingActivePartForm .
-    ?masAnimateSingActivePartForm ontolex:representation ?masAnimateSingActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimateSingularActiveParticipleForm .
+    ?masculineAnimateSingularActiveParticipleForm ontolex:representation ?masculineAnimateSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimateSingActivePartForm .
-    ?masInanimateSingActivePartForm ontolex:representation ?masInanimateSingActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimateSingularActiveParticipleForm .
+    ?masculineInanimateSingularActiveParticipleForm ontolex:representation ?masculineInanimateSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutSingActivePartForm .
-    ?neutSingActivePartForm ontolex:representation ?neutSingActivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterSingularActiveParticipleForm .
+    ?neuterSingularActiveParticipleForm ontolex:representation ?neuterSingularActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralActivePartForm .
-    ?femPluralActivePartForm ontolex:representation ?femPluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?femininePluralActiveParticipleForm .
+    ?femininePluralActiveParticipleForm ontolex:representation ?femininePluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimatePluralActivePartForm .
-    ?masAnimatePluralActivePartForm ontolex:representation ?masAnimatePluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimatePluralActiveParticipleForm .
+    ?masculineAnimatePluralActiveParticipleForm ontolex:representation ?masculineAnimatePluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q146786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimatePluralActivePartForm .
-    ?masInanimatePluralActivePartForm ontolex:representation ?masInanimatePluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimatePluralActiveParticipleForm .
+    ?masculineInanimatePluralActiveParticipleForm ontolex:representation ?masculineInanimatePluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q146786, wd:Q72249355 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutPluralActivePartForm .
-    ?neutPluralActivePartForm ontolex:representation ?neutPluralActivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterPluralActiveParticipleForm .
+    ?neuterPluralActiveParticipleForm ontolex:representation ?neuterPluralActiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146786, wd:Q72249355 .
   }
 
   # MARK: Passive Participle
 
 OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingPassivePartForm .
-    ?femSingPassivePartForm ontolex:representation ?femSingPassivePart ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularPassiveParticipleForm .
+    ?feminineSingularPassiveParticipleForm ontolex:representation ?feminineSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimateSingPassivePartForm .
-    ?masAnimateSingPassivePartForm ontolex:representation ?masAnimateSingPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimateSingularPassiveParticipleForm .
+    ?masculineAnimateSingularPassiveParticipleForm ontolex:representation ?masculineAnimateSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimateSingPassivePartForm .
-    ?masInanimateSingPassivePartForm ontolex:representation ?masInanimateSingPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimateSingularPassiveParticipleForm .
+    ?masculineInanimateSingularPassiveParticipleForm ontolex:representation ?masculineInanimateSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutSingPassivePartForm .
-    ?neutSingPassivePartForm ontolex:representation ?neutSingPassivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterSingularPassiveParticipleForm .
+    ?neuterSingularPassiveParticipleForm ontolex:representation ?neuterSingularPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralPassivePartForm .
-    ?femPluralPassivePartForm ontolex:representation ?femPluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?femininePluralPassiveParticipleForm .
+    ?femininePluralPassiveParticipleForm ontolex:representation ?femininePluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masAnimatePluralPassivePartForm .
-    ?masAnimatePluralPassivePartForm ontolex:representation ?masAnimatePluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineAnimatePluralPassiveParticipleForm .
+    ?masculineAnimatePluralPassiveParticipleForm ontolex:representation ?masculineAnimatePluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q146786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masInanimatePluralPassivePartForm .
-    ?masInanimatePluralPassivePartForm ontolex:representation ?masInanimatePluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?masculineInanimatePluralPassiveParticipleForm .
+    ?masculineInanimatePluralPassiveParticipleForm ontolex:representation ?masculineInanimatePluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q146786, wd:Q72249544 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neutPluralPassivePartForm .
-    ?neutPluralPassivePartForm ontolex:representation ?neutPluralPassivePart ;
+    ?lexeme ontolex:lexicalForm ?neuterPluralPassiveParticipleForm .
+    ?neuterPluralPassiveParticipleForm ontolex:representation ?neuterPluralPassiveParticiple ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146786, wd:Q72249544 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Portuguese/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Portuguese/verbs/query_verbs.sparql
index f44dabf36..c66688f71 100644
--- a/src/scribe_data/language_data_extraction/Portuguese/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Portuguese/verbs/query_verbs.sparql
@@ -5,14 +5,30 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
-  ?perfFPS ?perfSPS ?perfTPS
-  ?perfFPP ?perfSPP ?perfTPP
-  ?impFPS ?impSPS ?impTPS
-  ?impFPP ?impSPP ?impTPP
-  ?fSimpFPS ?fSimpSPS ?fSimpTPS
-  ?fSimpFPP ?fSimpSPP ?fSimpTPP
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
+  ?indicativePastPerfectFirstPersonSingular
+  ?indicativePastPerfectSecondPersonSingular
+  ?indicativePastPerfectThirdPersonSingular
+  ?indicativePastPerfectFirstPersonPlural
+  ?indicativePastPerfectSecondPersonPlural
+  ?indicativePastPerfectThirdPersonPlural
+  ?indicativePastImperfectFirstPersonSingular
+  ?indicativePastImperfectSecondPersonSingular
+  ?indicativePastImperfectThirdPersonSingular
+  ?indicativePastImperfectFirstPersonPlural
+  ?indicativePastImperfectSecondPersonPlural
+  ?indicativePastImperfectThirdPersonPlural
+  ?indicativePluperfectFirstPersonSingular
+  ?indicativePluperfectSecondPersonSingular
+  ?indicativePluperfectThirdPersonSingular
+  ?indicativePluperfectFirstPersonPlural
+  ?indicativePluperfectSecondPersonPlural
+  ?indicativePluperfectThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q5146 ;
@@ -31,152 +47,152 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   # MARK: Past Perfect
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?perfFPSForm .
-    ?perfFPSForm ontolex:representation ?perfFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPerfectFirstPersonSingularForm .
+    ?indicativePastPerfectFirstPersonSingularForm ontolex:representation ?indicativePastPerfectFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q64005357 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?perfSPSForm .
-    ?perfSPSForm ontolex:representation ?perfSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPerfectSecondPersonSingularForm .
+    ?indicativePastPerfectSecondPersonSingularForm ontolex:representation ?indicativePastPerfectSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q64005357 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?perfTPSForm .
-    ?perfTPSForm ontolex:representation ?perfTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPerfectThirdPersonSingularForm .
+    ?indicativePastPerfectThirdPersonSingularForm ontolex:representation ?indicativePastPerfectThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q64005357 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?perfFPPForm .
-    ?perfFPPForm ontolex:representation ?perfFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPerfectFirstPersonPluralForm .
+    ?indicativePastPerfectFirstPersonPluralForm ontolex:representation ?indicativePastPerfectFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q64005357 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?perfSPPForm .
-    ?perfSPPForm ontolex:representation ?perfSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPerfectSecondPersonPluralForm .
+    ?indicativePastPerfectSecondPersonPluralForm ontolex:representation ?indicativePastPerfectSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q64005357 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?perfTPPForm .
-    ?perfTPPForm ontolex:representation ?perfTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPerfectThirdPersonPluralForm .
+    ?indicativePastPerfectThirdPersonPluralForm ontolex:representation ?indicativePastPerfectThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q64005357 .
   }
 
   # MARK: Past Imperfect
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPSForm .
-    ?impFPSForm ontolex:representation ?impFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePastImperfectFirstPersonSingularForm .
+    ?indicativePastImperfectFirstPersonSingularForm ontolex:representation ?indicativePastImperfectFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSForm .
-    ?impSPSForm ontolex:representation ?impSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePastImperfectSecondPersonSingularForm .
+    ?indicativePastImperfectSecondPersonSingularForm ontolex:representation ?indicativePastImperfectSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPSForm .
-    ?impTPSForm ontolex:representation ?impTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePastImperfectThirdPersonSingularForm .
+    ?indicativePastImperfectThirdPersonSingularForm ontolex:representation ?indicativePastImperfectThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPPForm .
-    ?impFPPForm ontolex:representation ?impFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePastImperfectFirstPersonPluralForm .
+    ?indicativePastImperfectFirstPersonPluralForm ontolex:representation ?indicativePastImperfectFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPForm .
-    ?impSPPForm ontolex:representation ?impSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePastImperfectSecondPersonPluralForm .
+    ?indicativePastImperfectSecondPersonPluralForm ontolex:representation ?indicativePastImperfectSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPPForm .
-    ?impTPPForm ontolex:representation ?impTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePastImperfectThirdPersonPluralForm .
+    ?indicativePastImperfectThirdPersonPluralForm ontolex:representation ?indicativePastImperfectThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q12547192 .
   }
 
   # MARK: Future Simple
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?fSimpFPSForm .
-    ?fSimpFPSForm ontolex:representation ?fSimpFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePluperfectFirstPersonSingularForm .
+    ?indicativePluperfectFirstPersonSingularForm ontolex:representation ?indicativePluperfectFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q623742, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?fSimpSPSForm .
-    ?fSimpSPSForm ontolex:representation ?fSimpSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePluperfectSecondPersonSingularForm .
+    ?indicativePluperfectSecondPersonSingularForm ontolex:representation ?indicativePluperfectSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q623742, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?fSimpTPSForm .
-    ?fSimpTPSForm ontolex:representation ?fSimpTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePluperfectThirdPersonSingularForm .
+    ?indicativePluperfectThirdPersonSingularForm ontolex:representation ?indicativePluperfectThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q623742, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?fSimpFPPForm .
-    ?fSimpFPPForm ontolex:representation ?fSimpFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePluperfectFirstPersonPluralForm .
+    ?indicativePluperfectFirstPersonPluralForm ontolex:representation ?indicativePluperfectFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q623742, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?fSimpSPPForm .
-    ?fSimpSPPForm ontolex:representation ?fSimpSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePluperfectSecondPersonPluralForm .
+    ?indicativePluperfectSecondPersonPluralForm ontolex:representation ?indicativePluperfectSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q623742, wd:Q682111 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?fSimpTPPForm .
-    ?fSimpTPPForm ontolex:representation ?fSimpTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePluperfectThirdPersonPluralForm .
+    ?indicativePluperfectThirdPersonPluralForm ontolex:representation ?indicativePluperfectThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q623742, wd:Q682111 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Punjabi/Gurmukhi/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Punjabi/Gurmukhi/nouns/query_nouns.sparql
index 0f0cd85b5..be7fa9da5 100644
--- a/src/scribe_data/language_data_extraction/Punjabi/Gurmukhi/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Punjabi/Gurmukhi/nouns/query_nouns.sparql
@@ -22,7 +22,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "pa") .
+      FILTER(lang(?plural) = "pa")
   }
 
   # MARK: Gender(s)
diff --git a/src/scribe_data/language_data_extraction/Punjabi/Shahmukhi/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Punjabi/Shahmukhi/nouns/query_nouns.sparql
index d0958df96..107d7e513 100644
--- a/src/scribe_data/language_data_extraction/Punjabi/Shahmukhi/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Punjabi/Shahmukhi/nouns/query_nouns.sparql
@@ -23,7 +23,7 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "pnb") .
+      FILTER(lang(?plural) = "pnb")
   }
 
   # MARK: Gender(s)
diff --git a/src/scribe_data/language_data_extraction/Russian/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Russian/adjectives/query_adjectives.sparql
index c78e38832..d5bd7994c 100644
--- a/src/scribe_data/language_data_extraction/Russian/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Russian/adjectives/query_adjectives.sparql
@@ -5,35 +5,41 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?masculineNominativeSingular
-  ?neuterNominativeSingular
-  ?feminineNominativeSingular
+  ?nominativeFeminineSingular
+  ?nominativeMasculineSingular
+  ?nominativeNeuterSingular
   ?nominativePlural
-  ?masculineGenitiveSingular
-  ?neuterGenitiveSingular
-  ?feminineGenitiveSingular
+
+  ?genitiveFeminineSingular
+  ?genitiveMasculineSingular
+  ?genitiveNeuterSingular
   ?genitivePlural
-  ?masculineDativeSingular
-  ?neuterDativeSingular
-  ?feminineDativeSingular
+
+  ?dativeFeminineSingular
+  ?dativeMasculineSingular
+  ?dativeNeuterSingular
   ?dativePlural
-  ?masculineAnimateAccusativeSingular
-  ?neuterAnimateAccusativeSingular
-  ?feminineAnimateAccusativeSingular
-  ?animateAccusativePlural
-  ?masculineInstrumentalSingular
-  ?neuterInstrumentalSingular
-  ?feminineInstrumentalSingular
+
+  ?accusativeFeminineAnimateSingular
+  ?accusativeMasculineAnimateSingular
+  ?accusativeAnimateNeuterSingular
+  ?accusativeAnimatePlural
+  ?accusativeInanimateSingular
+  ?accusativeInanimatePlural
+
+  ?instrumentalFeminineSingular
+  ?instrumentalMasculineSingular
+  ?instrumentalNeuterSingular
   ?instrumentalPlural
-  ?masculinePrepositionalSingular
-  ?neuterPrepositionalSingular
-  ?femininePrepositionalSingular
+
+  ?prepositionalFeminineSingular
+  ?prepositionalMasculineSingular
+  ?prepositionalNeuterSingular
   ?prepositionalPlural
-  ?inanimateAccusativeSingular
-  ?inanimateAccusativePlural
-  ?masculineShortSingular
-  ?neuterShortSingular
-  ?feminineShortSingular
+
+  ?feminineSingularShort
+  ?masculineSingularShort
+  ?neuterSingularShort
   ?pluralShort
 
 WHERE {
@@ -44,21 +50,21 @@ WHERE {
   # MARK: Nominative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineNominativeSingularForm .
-    ?masculineNominativeSingularForm ontolex:representation ?masculineNominativeSingular ;
-      wikibase:grammaticalFeature wd:Q499327, wd:Q131105, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineSingularForm .
+    ?nominativeFeminineSingularForm ontolex:representation ?nominativeFeminineSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q131105, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterNominativeSingularForm .
-    ?neuterNominativeSingularForm ontolex:representation ?neuterNominativeSingular ;
-      wikibase:grammaticalFeature wd:Q1775461, wd:Q131105, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineSingularForm .
+    ?nominativeMasculineSingularForm ontolex:representation ?nominativeMasculineSingular ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q131105, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineNominativeSingularForm .
-    ?feminineNominativeSingularForm ontolex:representation ?feminineNominativeSingular ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q131105, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?nominativeNeuterSingularForm .
+    ?nominativeNeuterSingularForm ontolex:representation ?nominativeNeuterSingular ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q131105, wd:Q110786 .
   }
 
   OPTIONAL {
@@ -70,21 +76,21 @@ WHERE {
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineGenitiveSingularForm .
-    ?masculineGenitiveSingularForm ontolex:representation ?masculineGenitiveSingular ;
-      wikibase:grammaticalFeature wd:Q499327, wd:Q146233, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineSingularForm .
+    ?genitiveFeminineSingularForm ontolex:representation ?genitiveFeminineSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q146233, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterGenitiveSingularForm .
-    ?neuterGenitiveSingularForm ontolex:representation ?neuterGenitiveSingular ;
-      wikibase:grammaticalFeature wd:Q1775461, wd:Q146233, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineSingularForm .
+    ?genitiveMasculineSingularForm ontolex:representation ?genitiveMasculineSingular ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q146233, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineGenitiveSingularForm .
-    ?feminineGenitiveSingularForm ontolex:representation ?feminineGenitiveSingular ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q146233, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?genitiveNeuterSingularForm .
+    ?genitiveNeuterSingularForm ontolex:representation ?genitiveNeuterSingular ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q146233, wd:Q110786 .
   }
 
   OPTIONAL {
@@ -96,21 +102,21 @@ WHERE {
   # MARK: Dative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineDativeSingularForm .
-    ?masculineDativeSingularForm ontolex:representation ?masculineDativeSingular ;
-      wikibase:grammaticalFeature wd:Q499327, wd:Q145599, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?dativeFeminineSingularForm .
+    ?dativeFeminineSingularForm ontolex:representation ?dativeFeminineSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q145599, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterDativeSingularForm .
-    ?neuterDativeSingularForm ontolex:representation ?neuterDativeSingular ;
-      wikibase:grammaticalFeature wd:Q1775461, wd:Q145599, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?dativeMasculineSingularForm .
+    ?dativeMasculineSingularForm ontolex:representation ?dativeMasculineSingular ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q145599, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineDativeSingularForm .
-    ?feminineDativeSingularForm ontolex:representation ?feminineDativeSingular ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q145599, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?dativeNeuterSingularForm .
+    ?dativeNeuterSingularForm ontolex:representation ?dativeNeuterSingular ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q145599, wd:Q110786 .
   }
 
   OPTIONAL {
@@ -122,59 +128,59 @@ WHERE {
   # MARK: Accusative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineAnimateAccusativeSingularForm .
-    ?masculineAnimateAccusativeSingularForm ontolex:representation ?masculineAnimateAccusativeSingular ;
-      wikibase:grammaticalFeature wd:Q499327,wd:Q51927507, wd:Q146078, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineAnimateSingularForm .
+    ?accusativeFeminineAnimateSingularForm ontolex:representation ?accusativeFeminineAnimateSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q51927507, wd:Q146078, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterAnimateAccusativeSingularForm .
-    ?neuterAnimateAccusativeSingularForm ontolex:representation ?neuterAnimateAccusativeSingular ;
-      wikibase:grammaticalFeature wd:Q1775461,wd:Q51927507, wd:Q146078, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineAnimateSingularForm .
+    ?accusativeMasculineAnimateSingularForm ontolex:representation ?accusativeMasculineAnimateSingular ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q51927507, wd:Q146078, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineAnimateAccusativeSingularForm .
-    ?feminineAnimateAccusativeSingularForm ontolex:representation ?feminineAnimateAccusativeSingular ;
-      wikibase:grammaticalFeature wd:Q1775415,wd:Q51927507 ,wd:Q146078, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?accusativeAnimateNeuterSingularForm .
+    ?accusativeAnimateNeuterSingularForm ontolex:representation ?accusativeAnimateNeuterSingular ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q51927507, wd:Q146078, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?animateAccusativePluralForm .
-    ?animateAccusativePluralForm ontolex:representation ?animateAccusativePlural ;
+    ?lexeme ontolex:lexicalForm ?accusativeAnimatePluralForm .
+    ?accusativeAnimatePluralForm ontolex:representation ?accusativeAnimatePlural ;
       wikibase:grammaticalFeature wd:Q51927507, wd:Q146078, wd:Q146786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?inanimateAccusativeSingularForm .
-    ?inanimateAccusativeSingularForm ontolex:representation ?inanimateAccusativeSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeInanimateSingularForm .
+    ?accusativeInanimateSingularForm ontolex:representation ?accusativeInanimateSingular ;
       wikibase:grammaticalFeature wd:Q51927539, wd:Q146078, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?inanimateAccusativePluralForm .
-    ?inanimateAccusativePluralForm ontolex:representation ?inanimateAccusativePlural ;
+    ?lexeme ontolex:lexicalForm ?accusativeInanimatePluralForm .
+    ?accusativeInanimatePluralForm ontolex:representation ?accusativeInanimatePlural ;
       wikibase:grammaticalFeature wd:Q51927539, wd:Q146078, wd:Q146786 .
   }
 
   # MARK: Instrumental
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineInstrumentalSingularForm .
-    ?masculineInstrumentalSingularForm ontolex:representation ?masculineInstrumentalSingular ;
-      wikibase:grammaticalFeature wd:Q499327, wd:Q192997, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?instrumentalFeminineSingularForm .
+    ?instrumentalFeminineSingularForm ontolex:representation ?instrumentalFeminineSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q192997, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterInstrumentalSingularForm .
-    ?neuterInstrumentalSingularForm ontolex:representation ?neuterInstrumentalSingular ;
-      wikibase:grammaticalFeature wd:Q1775461, wd:Q192997, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?instrumentalMasculineSingularForm .
+    ?instrumentalMasculineSingularForm ontolex:representation ?instrumentalMasculineSingular ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q192997, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineInstrumentalSingularForm .
-    ?feminineInstrumentalSingularForm ontolex:representation ?feminineInstrumentalSingular ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q192997, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?instrumentalNeuterSingularForm .
+    ?instrumentalNeuterSingularForm ontolex:representation ?instrumentalNeuterSingular ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q192997, wd:Q110786 .
   }
 
   OPTIONAL {
@@ -186,47 +192,47 @@ WHERE {
   # MARK: Prepositional
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculinePrepositionalSingularForm .
-    ?masculinePrepositionalSingularForm ontolex:representation ?masculinePrepositionalSingular ;
-      wikibase:grammaticalFeature wd:Q499327, wd:Q2114906, wd:Q110786  .
+    ?lexeme ontolex:lexicalForm ?prepositionalFeminineSingularForm .
+    ?prepositionalFeminineSingularForm ontolex:representation ?prepositionalFeminineSingular ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q2114906, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterPrepositionalSingularForm .
-    ?neuterPrepositionalSingularForm ontolex:representation ?neuterPrepositionalSingular ;
-      wikibase:grammaticalFeature wd:Q1775461, wd:Q2114906, wd:Q110786  .
+    ?lexeme ontolex:lexicalForm ?prepositionalMasculineSingularForm .
+    ?prepositionalMasculineSingularForm ontolex:representation ?prepositionalMasculineSingular ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q2114906, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femininePrepositionalSingularForm .
-    ?femininePrepositionalSingularForm ontolex:representation ?femininePrepositionalSingular ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q2114906, wd:Q110786  .
+    ?lexeme ontolex:lexicalForm ?prepositionalNeuterSingularForm .
+    ?prepositionalNeuterSingularForm ontolex:representation ?prepositionalNeuterSingular ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q2114906, wd:Q110786 .
   }
 
   OPTIONAL {
     ?lexeme ontolex:lexicalForm ?prepositionalPluralForm .
     ?prepositionalPluralForm ontolex:representation ?prepositionalPlural ;
-      wikibase:grammaticalFeature wd:Q2114906, wd:Q146786  .
+      wikibase:grammaticalFeature wd:Q2114906, wd:Q146786 .
   }
 
   # MARK: Short
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineShortSingularForm .
-    ?masculineShortSingularForm ontolex:representation ?masculineShortSingular ;
-      wikibase:grammaticalFeature wd:Q499327, wd:Q4239848, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?feminineSingularShortForm .
+    ?feminineSingularShortForm ontolex:representation ?feminineSingularShort ;
+      wikibase:grammaticalFeature wd:Q1775415, wd:Q4239848, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterShortSingularForm .
-    ?neuterShortSingularForm ontolex:representation ?neuterShortSingular ;
-      wikibase:grammaticalFeature wd:Q1775461, wd:Q4239848, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?masculineSingularShortForm .
+    ?masculineSingularShortForm ontolex:representation ?masculineSingularShort ;
+      wikibase:grammaticalFeature wd:Q499327, wd:Q4239848, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineShortSingularForm .
-    ?feminineShortSingularForm ontolex:representation ?feminineShortSingular ;
-      wikibase:grammaticalFeature wd:Q1775415, wd:Q4239848, wd:Q110786 .
+    ?lexeme ontolex:lexicalForm ?neuterSingularShortForm .
+    ?neuterSingularShortForm ontolex:representation ?neuterSingularShort ;
+      wikibase:grammaticalFeature wd:Q1775461, wd:Q4239848, wd:Q110786 .
   }
 
   OPTIONAL {
diff --git a/src/scribe_data/language_data_extraction/Russian/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Russian/nouns/query_nouns.sparql
index fbb3f655d..d79ced8c1 100644
--- a/src/scribe_data/language_data_extraction/Russian/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Russian/nouns/query_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -15,16 +15,16 @@ WHERE {
   # MARK: Nominative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Russian/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Russian/proper_nouns/query_proper_nouns.sparql
index ee2eff42e..2f0e79f82 100644
--- a/src/scribe_data/language_data_extraction/Russian/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Russian/proper_nouns/query_proper_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
@@ -15,16 +15,16 @@ WHERE {
   # MARK: Nominative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Russian/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Russian/verbs/query_verbs.sparql
index e1b8efbc0..76edcb08d 100644
--- a/src/scribe_data/language_data_extraction/Russian/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Russian/verbs/query_verbs.sparql
@@ -5,9 +5,16 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
-  ?pastFeminine ?pastMasculine ?pastNeutral ?pastPlural
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
+  ?feminineIndicativePast
+  ?masculineIndicativePast
+  ?neuterIndicativePast
+  ?indicativePastPlural
 
 WHERE {
   ?lexeme dct:language wd:Q7737 ;
@@ -22,70 +29,70 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   # MARK: Past Feminine
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastFeminineForm .
-    ?pastFeminineForm ontolex:representation ?pastFeminine ;
+    ?lexeme ontolex:lexicalForm ?feminineIndicativePastForm .
+    ?feminineIndicativePastForm ontolex:representation ?feminineIndicativePast ;
       wikibase:grammaticalFeature wd:Q682111, wd:Q1994301, wd:Q1775415 .
   }
 
   # MARK: Past Masculine
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastMasculineForm .
-    ?pastMasculineForm ontolex:representation ?pastMasculine ;
+    ?lexeme ontolex:lexicalForm ?masculineIndicativePastForm .
+    ?masculineIndicativePastForm ontolex:representation ?masculineIndicativePast ;
       wikibase:grammaticalFeature wd:Q682111, wd:Q1994301, wd:Q499327 .
   }
 
   # MARK: Past Neutral
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastNeutralForm .
-    ?pastNeutralForm ontolex:representation ?pastNeutral ;
+    ?lexeme ontolex:lexicalForm ?neuterIndicativePastForm .
+    ?neuterIndicativePastForm ontolex:representation ?neuterIndicativePast ;
       wikibase:grammaticalFeature wd:Q682111, wd:Q1994301, wd:Q1775461 .
   }
 
   # MARK: Past Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastPluralForm .
-    ?pastPluralForm ontolex:representation ?pastPlural ;
+    ?lexeme ontolex:lexicalForm ?indicativePastPluralForm .
+    ?indicativePastPluralForm ontolex:representation ?indicativePastPlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q682111, wd:Q1994301 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_1.sparql b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_1.sparql
index 6cb45f067..07e33cf6c 100644
--- a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_1.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_1.sparql
@@ -5,11 +5,11 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?feminineNominativeSingular
-  ?masculineNominativeSingular
-  ?neuterNominativeSingular
-  ?masculinePersonalNominativePlural
-  ?notMasculinePersonalNominativePlural
+  ?nominativeFeminineSingularPositive
+  ?nominativeMasculineSingularPositive
+  ?nominativeNeuterSingularPositive
+  ?nominativeMasculinePersonalPluralPositive
+  ?nominativeNotMasculinePersonalPluralPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9058;
@@ -19,32 +19,32 @@ WHERE {
   # MARK: Nominative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineNominativeSingularForm .
-    ?feminineNominativeSingularForm ontolex:representation ?feminineNominativeSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineSingularPositiveForm .
+    ?nominativeFeminineSingularPositiveForm ontolex:representation ?nominativeFeminineSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q131105, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineNominativeSingularForm .
-    ?masculineNominativeSingularForm ontolex:representation ?masculineNominativeSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineSingularPositiveForm .
+    ?nominativeMasculineSingularPositiveForm ontolex:representation ?nominativeMasculineSingularPositive ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q131105, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterNominativeSingularForm .
-    ?neuterNominativeSingularForm ontolex:representation ?neuterNominativeSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeNeuterSingularPositiveForm .
+    ?nominativeNeuterSingularPositiveForm ontolex:representation ?nominativeNeuterSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q131105, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculinePersonalNominativePluralForm .
-    ?masculinePersonalNominativePluralForm ontolex:representation ?masculinePersonalNominativePlural ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculinePersonalPluralPositiveForm .
+    ?nominativeMasculinePersonalPluralPositiveForm ontolex:representation ?nominativeMasculinePersonalPluralPositive ;
       wikibase:grammaticalFeature wd:Q27918551, wd:Q131105, wd:Q146786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?notMasculinePersonalNominativePluralForm .
-    ?notMasculinePersonalNominativePluralForm ontolex:representation ?notMasculinePersonalNominativePlural ;
+    ?lexeme ontolex:lexicalForm ?nominativeNotMasculinePersonalPluralPositiveForm .
+    ?nominativeNotMasculinePersonalPluralPositiveForm ontolex:representation ?nominativeNotMasculinePersonalPluralPositive ;
       wikibase:grammaticalFeature wd:Q54152717, wd:Q131105, wd:Q146786, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_2.sparql b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_2.sparql
index f7c5f01ae..abbc667cd 100644
--- a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_2.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_2.sparql
@@ -5,10 +5,10 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?feminineGenitiveSingular
-  ?masculineGenitiveSingular
-  ?neuterGenitiveSingular
-  ?genitivePlural
+  ?genitiveFeminineSingularPositive
+  ?genitiveMasculineSingularPositive
+  ?genitiveNeuterSingularPositive
+  ?genitivePluralPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9058;
@@ -18,26 +18,26 @@ WHERE {
   # MARK: Genitive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineGenitiveSingularForm .
-    ?feminineGenitiveSingularForm ontolex:representation ?feminineGenitiveSingular ;
+    ?lexeme ontolex:lexicalForm ?genitiveFeminineSingularPositiveForm .
+    ?genitiveFeminineSingularPositiveForm ontolex:representation ?genitiveFeminineSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146233, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineGenitiveSingularForm .
-    ?masculineGenitiveSingularForm ontolex:representation ?masculineGenitiveSingular ;
+    ?lexeme ontolex:lexicalForm ?genitiveMasculineSingularPositiveForm .
+    ?genitiveMasculineSingularPositiveForm ontolex:representation ?genitiveMasculineSingularPositive ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146233, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterGenitiveSingularForm .
-    ?neuterGenitiveSingularForm ontolex:representation ?neuterGenitiveSingular ;
+    ?lexeme ontolex:lexicalForm ?genitiveNeuterSingularPositiveForm .
+    ?genitiveNeuterSingularPositiveForm ontolex:representation ?genitiveNeuterSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146233, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?genitivePluralForm .
-    ?genitivePluralForm ontolex:representation ?genitivePlural ;
+    ?lexeme ontolex:lexicalForm ?genitivePluralPositiveForm .
+    ?genitivePluralPositiveForm ontolex:representation ?genitivePluralPositive ;
       wikibase:grammaticalFeature wd:Q146233, wd:Q146786, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_3.sparql b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_3.sparql
index aab76cd3e..a1b8e1dc3 100644
--- a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_3.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_3.sparql
@@ -5,10 +5,10 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?feminineDativeSingular
-  ?masculineDativeSingular
-  ?neuterDativeSingular
-  ?dativePlural
+  ?dativeFeminineSingularPositive
+  ?dativeMasculineSingularPositive
+  ?dativeNeuterSingularPositive
+  ?dativePluralPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9058;
@@ -18,26 +18,26 @@ WHERE {
   # MARK: Dative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineDativeSingularForm .
-    ?feminineDativeSingularForm ontolex:representation ?feminineDativeSingular ;
+    ?lexeme ontolex:lexicalForm ?dativeFeminineSingularPositiveForm .
+    ?dativeFeminineSingularPositiveForm ontolex:representation ?dativeFeminineSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q145599, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineDativeSingularForm .
-    ?masculineDativeSingularForm ontolex:representation ?masculineDativeSingular ;
+    ?lexeme ontolex:lexicalForm ?dativeMasculineSingularPositiveForm .
+    ?dativeMasculineSingularPositiveForm ontolex:representation ?dativeMasculineSingularPositive ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q145599, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterDativeSingularForm .
-    ?neuterDativeSingularForm ontolex:representation ?neuterDativeSingular ;
+    ?lexeme ontolex:lexicalForm ?dativeNeuterSingularPositiveForm .
+    ?dativeNeuterSingularPositiveForm ontolex:representation ?dativeNeuterSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q145599, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?DativePluralForm .
-    ?DativePluralForm ontolex:representation ?dativePlural ;
+    ?lexeme ontolex:lexicalForm ?dativePluralPositiveForm .
+    ?dativePluralPositiveForm ontolex:representation ?dativePluralPositive ;
       wikibase:grammaticalFeature wd:Q145599, wd:Q146786, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_4.sparql b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_4.sparql
index 6a0cf8edc..91ea51b0c 100644
--- a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_4.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_4.sparql
@@ -5,12 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?feminineAccusativeSingular
-  ?masculineAnimateAccusativeSingular
-  ?masculineInanimateAccusativeSingular
-  ?neuterAccusativeSingular
-  ?masculinePersonalAccusativePlural
-  ?notMasculinePersonalAccusativePlural
+  ?accusativeFeminineSingularPositive
+  ?accusativeMasculineAnimateSingularPositive
+  ?accusativeMasculineInanimateSingularPositive
+  ?accusativeNeuterSingularPositive
+  ?accusativeMasculinePersonalPluralPositive
+  ?accusativeNotMasculinePersonalPluralPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9058;
@@ -20,38 +20,38 @@ WHERE {
   # MARK: Accustive
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineAccusativeSingularForm .
-    ?feminineAccusativeSingularForm ontolex:representation ?feminineAccusativeSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeFeminineSingularPositiveForm .
+    ?accusativeFeminineSingularPositiveForm ontolex:representation ?accusativeFeminineSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146078, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineAccusativeSingularForm .
-    ?masculineAccusativeSingularForm ontolex:representation ?masculineAnimateAccusativeSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineAnimateSingularPositiveForm .
+    ?accusativeMasculineAnimateSingularPositiveForm ontolex:representation ?accusativeMasculineAnimateSingularPositive ;
       wikibase:grammaticalFeature wd:Q54020116, wd:Q146078, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineAccusativeSingularForm .
-    ?masculineAccusativeSingularForm ontolex:representation ?masculineInanimateAccusativeSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculineInanimateSingularPositiveForm .
+    ?accusativeMasculineInanimateSingularPositiveForm ontolex:representation ?accusativeMasculineInanimateSingularPositive ;
       wikibase:grammaticalFeature wd:Q52943434, wd:Q146078, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterAccusativeSingularForm .
-    ?neuterAccusativeSingularForm ontolex:representation ?neuterAccusativeSingular ;
+    ?lexeme ontolex:lexicalForm ?accusativeNeuterSingularPositiveForm .
+    ?accusativeNeuterSingularPositiveForm ontolex:representation ?accusativeNeuterSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q146078, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculinePersonalAccusativePluralForm .
-    ?masculinePersonalAccusativePluralForm ontolex:representation ?masculinePersonalAccusativePlural ;
+    ?lexeme ontolex:lexicalForm ?accusativeMasculinePersonalPluralPositiveForm .
+    ?accusativeMasculinePersonalPluralPositiveForm ontolex:representation ?accusativeMasculinePersonalPluralPositive ;
       wikibase:grammaticalFeature wd:Q27918551, wd:Q146078, wd:Q146786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?notMasculinePersonalAccusativePluralForm .
-    ?notMasculinePersonalAccusativePluralForm ontolex:representation ?notMasculinePersonalAccusativePlural ;
+    ?lexeme ontolex:lexicalForm ?accusativeNotMasculinePersonalPluralPositiveForm .
+    ?accusativeNotMasculinePersonalPluralPositiveForm ontolex:representation ?accusativeNotMasculinePersonalPluralPositive ;
       wikibase:grammaticalFeature wd:Q54152717, wd:Q146078, wd:Q146786, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_5.sparql b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_5.sparql
index 88d76cb95..d404c2185 100644
--- a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_5.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_5.sparql
@@ -5,10 +5,10 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?feminineLocativeSingular
-  ?masculineLocativeSingular
-  ?neuterLocativeSingular
-  ?locativePlural
+  ?locativeFeminineSingularPositive
+  ?locativeMasculineSingularPositive
+  ?locativeNeuterSingularPositive
+  ?locativePluralPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9058;
@@ -18,26 +18,26 @@ WHERE {
   # MARK: Locative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineLocativeSingularForm .
-    ?feminineLocativeSingularForm ontolex:representation ?feminineLocativeSingular ;
+    ?lexeme ontolex:lexicalForm ?locativeFeminineSingularPositiveForm .
+    ?locativeFeminineSingularPositiveForm ontolex:representation ?locativeFeminineSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q202142, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineLocativeSingularForm .
-    ?masculineLocativeSingularForm ontolex:representation ?masculineLocativeSingular ;
+    ?lexeme ontolex:lexicalForm ?locativeMasculineSingularPositiveForm .
+    ?locativeMasculineSingularPositiveForm ontolex:representation ?locativeMasculineSingularPositive ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q202142, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterLocativeSingularForm .
-    ?neuterLocativeSingularForm ontolex:representation ?neuterLocativeSingular ;
+    ?lexeme ontolex:lexicalForm ?locativeNeuterSingularPositiveForm .
+    ?locativeNeuterSingularPositiveForm ontolex:representation ?locativeNeuterSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q202142, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?locativePluralForm .
-    ?locativePluralForm ontolex:representation ?locativePlural ;
+    ?lexeme ontolex:lexicalForm ?locativePluralPositiveForm .
+    ?locativePluralPositiveForm ontolex:representation ?locativePluralPositive ;
       wikibase:grammaticalFeature wd:Q202142, wd:Q146786, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_6.sparql b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_6.sparql
index 4c4f471d1..f7d029f39 100644
--- a/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_6.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/adjectives/query_adjectives_6.sparql
@@ -5,10 +5,10 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?feminineInstrumentalSingular
-  ?masculineInstrumentalSingular
-  ?neuterInstrumentalSingular
-  ?instrumentalPlural
+  ?instrumentalFeminineSingularPositive
+  ?instrumentalMasculineSingularPositive
+  ?instrumentalNeuterSingularPositive
+  ?instrumentalPluralPositive
 
 WHERE {
   ?lexeme dct:language wd:Q9058;
@@ -18,26 +18,26 @@ WHERE {
   # MARK: Instrumental
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineInstrumentalSingularForm .
-    ?feminineInstrumentalSingularForm ontolex:representation ?feminineInstrumentalSingular ;
+    ?lexeme ontolex:lexicalForm ?instrumentalFeminineSingularPositiveForm .
+    ?instrumentalFeminineSingularPositiveForm ontolex:representation ?instrumentalFeminineSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q192997, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineInstrumentalSingularForm .
-    ?masculineInstrumentalSingularForm ontolex:representation ?masculineInstrumentalSingular ;
+    ?lexeme ontolex:lexicalForm ?instrumentalMasculineSingularPositiveForm .
+    ?instrumentalMasculineSingularPositiveForm ontolex:representation ?instrumentalMasculineSingularPositive ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q192997, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterInstrumentalSingularForm .
-    ?neuterInstrumentalSingularForm ontolex:representation ?neuterInstrumentalSingular ;
+    ?lexeme ontolex:lexicalForm ?instrumentalNeuterSingularPositiveForm .
+    ?instrumentalNeuterSingularPositiveForm ontolex:representation ?instrumentalNeuterSingularPositive ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q192997, wd:Q110786, wd:Q3482678 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?instrumentalPluralForm .
-    ?instrumentalPluralForm ontolex:representation ?instrumentalPlural ;
+    ?lexeme ontolex:lexicalForm ?instrumentalPluralPositiveForm .
+    ?instrumentalPluralPositiveForm ontolex:representation ?instrumentalPluralPositive ;
       wikibase:grammaticalFeature wd:Q192997, wd:Q146786, wd:Q3482678 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Slovak/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Slovak/nouns/query_nouns.sparql
index c731ce729..2b7f5bd6b 100644
--- a/src/scribe_data/language_data_extraction/Slovak/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/nouns/query_nouns.sparql
@@ -4,20 +4,20 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?gender
 
 WHERE {
   ?lexeme dct:language wd:Q9058 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Slovak/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Slovak/proper_nouns/query_proper_nouns.sparql
index b5b845f2e..7e313d90f 100644
--- a/src/scribe_data/language_data_extraction/Slovak/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Slovak/proper_nouns/query_proper_nouns.sparql
@@ -5,7 +5,6 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?properNoun
-  ?nomPlural
   ?gender
 
 WHERE {
diff --git a/src/scribe_data/language_data_extraction/Spanish/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Spanish/adjectives/query_adjectives.sparql
index 1609e95eb..72a035d5e 100644
--- a/src/scribe_data/language_data_extraction/Spanish/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/adjectives/query_adjectives.sparql
@@ -5,14 +5,14 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adjective
-  ?femSingular
-  ?femSingularSuperlative
-  ?femPlural
-  ?femPluralSuperlative
-  ?masSingular
-  ?masSingularSuperlative
-  ?masPlural
-  ?masPluralSuperlative
+  ?feminineSingular
+  ?feminineSingularSuperlative
+  ?femininePlural
+  ?femininePluralSuperlative
+  ?masculineSingular
+  ?masculineSingularSuperlative
+  ?masculinePlural
+  ?masculinePluralSuperlative
 
 WHERE {
   ?lexeme dct:language wd:Q1321 ;
@@ -22,64 +22,64 @@ WHERE {
   # MARK: Feminine
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularForm .
-    ?femSingularForm ontolex:representation ?femSingular ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularForm .
+    ?feminineSingularForm ontolex:representation ?feminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786 .
       FILTER NOT EXISTS {
-        ?femSingularForm wikibase:grammaticalFeature wd:Q1817208 .
+        ?feminineSingularForm wikibase:grammaticalFeature wd:Q1817208 .
       }
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularSuperlativeForm .
-    ?femSingularSuperlativeForm ontolex:representation ?femSingularSuperlative ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularSuperlativeForm .
+    ?feminineSingularSuperlativeForm ontolex:representation ?feminineSingularSuperlative ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q1817208 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralForm .
-    ?femPluralForm ontolex:representation ?femPlural ;
+    ?lexeme ontolex:lexicalForm ?femininePluralForm .
+    ?femininePluralForm ontolex:representation ?femininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786 .
       FILTER NOT EXISTS {
-        ?femPluralForm wikibase:grammaticalFeature wd:Q1817208 .
+        ?femininePluralForm wikibase:grammaticalFeature wd:Q1817208 .
       }
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralSuperlativeForm .
-    ?femPluralSuperlativeForm ontolex:representation ?femPluralSuperlative ;
+    ?lexeme ontolex:lexicalForm ?femininePluralSuperlativeForm .
+    ?femininePluralSuperlativeForm ontolex:representation ?femininePluralSuperlative ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786, wd:Q1817208 .
   }
 
   # MARK: Masculine
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularForm .
-    ?masSingularForm ontolex:representation ?masSingular ;
+    ?lexeme ontolex:lexicalForm ?masculineSingularForm .
+    ?masculineSingularForm ontolex:representation ?masculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786 .
       FILTER NOT EXISTS {
-        ?masSingularForm wikibase:grammaticalFeature wd:Q1817208 .
+        ?masculineSingularForm wikibase:grammaticalFeature wd:Q1817208 .
       }
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularSuperlativeForm .
-    ?masSingularSuperlativeForm ontolex:representation ?masSingularSuperlative ;
+    ?lexeme ontolex:lexicalForm ?masculineSingularSuperlativeForm .
+    ?masculineSingularSuperlativeForm ontolex:representation ?masculineSingularSuperlative ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q1817208 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralForm .
-    ?masPluralForm ontolex:representation ?masPlural ;
+    ?lexeme ontolex:lexicalForm ?masculinePluralForm .
+    ?masculinePluralForm ontolex:representation ?masculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786 .
       FILTER NOT EXISTS {
-        ?masPluralForm wikibase:grammaticalFeature wd:Q1817208 .
+        ?masculinePluralForm wikibase:grammaticalFeature wd:Q1817208 .
       }
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralSuperlativeForm .
-    ?masPluralSuperlativeForm ontolex:representation ?masPluralSuperlative ;
+    ?lexeme ontolex:lexicalForm ?masculinePluralSuperlativeForm .
+    ?masculinePluralSuperlativeForm ontolex:representation ?masculinePluralSuperlative ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786, wd:Q1817208 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Spanish/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Spanish/nouns/query_nouns.sparql
index 257ba4665..ec40746f6 100644
--- a/src/scribe_data/language_data_extraction/Spanish/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/nouns/query_nouns.sparql
@@ -7,10 +7,10 @@ SELECT
   ?singular
   ?plural
   ?gender
-  ?masSingular
-  ?masPlural
-  ?femSingular
-  ?femPlural
+  ?masculineSingular
+  ?masculinePlural
+  ?feminineSingular
+  ?femininePlural
 
 WHERE {
   ?lexeme dct:language wd:Q1321 ;
@@ -35,27 +35,27 @@ WHERE {
 
   # MARK: masculine singular and plural forms.
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularForm .
-    ?masSingularForm ontolex:representation ?masSingular ;
+    ?lexeme ontolex:lexicalForm ?masculineSingularForm .
+    ?masculineSingularForm ontolex:representation ?masculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralForm .
-    ?masPluralForm ontolex:representation ?masPlural ;
+    ?lexeme ontolex:lexicalForm ?masculinePluralForm .
+    ?masculinePluralForm ontolex:representation ?masculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786 .
   }
 
   # MARK: feminine singular and plural forms.
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularForm .
-    ?femSingularForm ontolex:representation ?femSingular ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularForm .
+    ?feminineSingularForm ontolex:representation ?feminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralForm .
-    ?femPluralForm ontolex:representation ?femPlural ;
+    ?lexeme ontolex:lexicalForm ?femininePluralForm .
+    ?femininePluralForm ontolex:representation ?femininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Spanish/prepositions/query_prepositions.sparql b/src/scribe_data/language_data_extraction/Spanish/prepositions/query_prepositions.sparql
index af98f940f..e1a33a4ba 100644
--- a/src/scribe_data/language_data_extraction/Spanish/prepositions/query_prepositions.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/prepositions/query_prepositions.sparql
@@ -10,5 +10,5 @@ WHERE {
   ?lexeme dct:language wd:Q1321 ;
     wikibase:lexicalCategory wd:Q4833830 ;
     wikibase:lemma ?preposition ;
-    FILTER(lang(?preposition) = "es") .
+    FILTER(lang(?preposition) = "es")
 }
diff --git a/src/scribe_data/language_data_extraction/Spanish/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Spanish/proper_nouns/query_proper_nouns.sparql
index 28426655c..3197d13b7 100644
--- a/src/scribe_data/language_data_extraction/Spanish/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/proper_nouns/query_proper_nouns.sparql
@@ -7,10 +7,10 @@ SELECT
   ?singular
   ?plural
   ?gender
-  ?masSingular
-  ?masPlural
-  ?femSingular
-  ?femPlural
+  ?masculineSingular
+  ?masculinePlural
+  ?feminineSingular
+  ?femininePlural
 
 WHERE {
   ?lexeme dct:language wd:Q1321 ;
@@ -35,27 +35,27 @@ WHERE {
 
   # MARK: masculine singular and plural forms.
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masSingularForm .
-    ?masSingularForm ontolex:representation ?masSingular ;
+    ?lexeme ontolex:lexicalForm ?masculineSingularForm .
+    ?masculineSingularForm ontolex:representation ?masculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masPluralForm .
-    ?masPluralForm ontolex:representation ?masPlural ;
+    ?lexeme ontolex:lexicalForm ?masculinePluralForm .
+    ?masculinePluralForm ontolex:representation ?masculinePlural ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q146786 .
   }
 
   # MARK: feminine singular and plural forms.
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femSingularForm .
-    ?femSingularForm ontolex:representation ?femSingular ;
+    ?lexeme ontolex:lexicalForm ?feminineSingularForm .
+    ?feminineSingularForm ontolex:representation ?feminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?femPluralForm .
-    ?femPluralForm ontolex:representation ?femPlural ;
+    ?lexeme ontolex:lexicalForm ?femininePluralForm .
+    ?femininePluralForm ontolex:representation ?femininePlural ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_1.sparql b/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_1.sparql
index 15189e55e..6898dbd2f 100644
--- a/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_1.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_1.sparql
@@ -5,8 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?presFPS ?presSPS ?presTPS
-  ?presFPP ?presSPP ?presTPP
+  ?indicativePresentFirstPersonSingular
+  ?indicativePresentSecondPersonSingular
+  ?indicativePresentThirdPersonSingular
+  ?indicativePresentFirstPersonPlural
+  ?indicativePresentSecondPersonPlural
+  ?indicativePresentThirdPersonPlural
 
 
 WHERE {
@@ -21,38 +25,38 @@ WHERE {
   # MARK: Present
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPSForm .
-    ?presFPSForm ontolex:representation ?presFPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonSingularForm .
+    ?indicativePresentFirstPersonSingularForm ontolex:representation ?indicativePresentFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPSForm .
-    ?presSPSForm ontolex:representation ?presSPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonSingularForm .
+    ?indicativePresentSecondPersonSingularForm ontolex:representation ?indicativePresentSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPSForm .
-    ?presTPSForm ontolex:representation ?presTPS ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonSingularForm .
+    ?indicativePresentThirdPersonSingularForm ontolex:representation ?indicativePresentThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presFPPForm .
-    ?presFPPForm ontolex:representation ?presFPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentFirstPersonPluralForm .
+    ?indicativePresentFirstPersonPluralForm ontolex:representation ?indicativePresentFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presSPPForm .
-    ?presSPPForm ontolex:representation ?presSPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentSecondPersonPluralForm .
+    ?indicativePresentSecondPersonPluralForm ontolex:representation ?indicativePresentSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?presTPPForm .
-    ?presTPPForm ontolex:representation ?presTPP ;
+    ?lexeme ontolex:lexicalForm ?indicativePresentThirdPersonPluralForm .
+    ?indicativePresentThirdPersonPluralForm ontolex:representation ?indicativePresentThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q682111, wd:Q192613 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_2.sparql b/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_2.sparql
index 08a9bed0f..15ef7a1c5 100644
--- a/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_2.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_2.sparql
@@ -5,8 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?pretFPS ?pretSPS ?pretTPS
-  ?pretFPP ?pretSPP ?pretTPP
+  ?preteriteFirstPersonSingular
+  ?preteriteSecondPersonSingular
+  ?preteriteThirdPersonSingular
+  ?preteriteFirstPersonPlural
+  ?preteriteSecondPersonPlural
+  ?preteriteThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q1321 ;
@@ -20,38 +24,38 @@ WHERE {
   # MARK: Preterite
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPSForm .
-    ?pretFPSForm ontolex:representation ?pretFPS ;
+    ?lexeme ontolex:lexicalForm ?preteriteFirstPersonSingularForm .
+    ?preteriteFirstPersonSingularForm ontolex:representation ?preteriteFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPSForm .
-    ?pretSPSForm ontolex:representation ?pretSPS ;
+    ?lexeme ontolex:lexicalForm ?preteriteSecondPersonSingularForm .
+    ?preteriteSecondPersonSingularForm ontolex:representation ?preteriteSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPSForm .
-    ?pretTPSForm ontolex:representation ?pretTPS ;
+    ?lexeme ontolex:lexicalForm ?preteriteThirdPersonSingularForm .
+    ?preteriteThirdPersonSingularForm ontolex:representation ?preteriteThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretFPPForm .
-    ?pretFPPForm ontolex:representation ?pretFPP ;
+    ?lexeme ontolex:lexicalForm ?preteriteFirstPersonPluralForm .
+    ?preteriteFirstPersonPluralForm ontolex:representation ?preteriteFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretSPPForm .
-    ?pretSPPForm ontolex:representation ?pretSPP ;
+    ?lexeme ontolex:lexicalForm ?preteriteSecondPersonPluralForm .
+    ?preteriteSecondPersonPluralForm ontolex:representation ?preteriteSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q442485 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pretTPPForm .
-    ?pretTPPForm ontolex:representation ?pretTPP ;
+    ?lexeme ontolex:lexicalForm ?preteriteThirdPersonPluralForm .
+    ?preteriteThirdPersonPluralForm ontolex:representation ?preteriteThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q442485 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_3.sparql b/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_3.sparql
index bddb173d9..514841b7b 100644
--- a/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_3.sparql
+++ b/src/scribe_data/language_data_extraction/Spanish/verbs/query_verbs_3.sparql
@@ -5,8 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?infinitive
-  ?impFPS ?impSPS ?impTPS
-  ?impFPP ?impSPP ?impTPP
+  ?pastImperfectFirstPersonSingular
+  ?pastImperfectSecondPersonSingular
+  ?pastImperfectThirdPersonSingular
+  ?pastImperfectFirstPersonPlural
+  ?pastImperfectSecondPersonPlural
+  ?pastImperfectThirdPersonPlural
 
 WHERE {
   ?lexeme dct:language wd:Q1321 ;
@@ -20,38 +24,38 @@ WHERE {
   # MARK: Imperfect
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPSForm .
-    ?impFPSForm ontolex:representation ?impFPS ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectFirstPersonSingularForm .
+    ?pastImperfectFirstPersonSingularForm ontolex:representation ?pastImperfectFirstPersonSingular ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q110786, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPSForm .
-    ?impSPSForm ontolex:representation ?impSPS ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectSecondPersonSingularForm .
+    ?pastImperfectSecondPersonSingularForm ontolex:representation ?pastImperfectSecondPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q110786, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPSForm .
-    ?impTPSForm ontolex:representation ?impTPS ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectThirdPersonSingularForm .
+    ?pastImperfectThirdPersonSingularForm ontolex:representation ?pastImperfectThirdPersonSingular ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q110786, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impFPPForm .
-    ?impFPPForm ontolex:representation ?impFPP ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectFirstPersonPluralForm .
+    ?pastImperfectFirstPersonPluralForm ontolex:representation ?pastImperfectFirstPersonPlural ;
       wikibase:grammaticalFeature wd:Q21714344, wd:Q146786, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impSPPForm .
-    ?impSPPForm ontolex:representation ?impSPP ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectSecondPersonPluralForm .
+    ?pastImperfectSecondPersonPluralForm ontolex:representation ?pastImperfectSecondPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929049, wd:Q146786, wd:Q12547192 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?impTPPForm .
-    ?impTPPForm ontolex:representation ?impTPP ;
+    ?lexeme ontolex:lexicalForm ?pastImperfectThirdPersonPluralForm .
+    ?pastImperfectThirdPersonPluralForm ontolex:representation ?pastImperfectThirdPersonPlural ;
       wikibase:grammaticalFeature wd:Q51929074, wd:Q146786, wd:Q12547192 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Swahili/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Swahili/nouns/query_nouns.sparql
index 8846fdb51..6a86a7517 100644
--- a/src/scribe_data/language_data_extraction/Swahili/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Swahili/nouns/query_nouns.sparql
@@ -19,6 +19,6 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "sw") .
+      FILTER(lang(?plural) = "sw")
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Swedish/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Swedish/nouns/query_nouns.sparql
index 0af103c0b..d49206311 100644
--- a/src/scribe_data/language_data_extraction/Swedish/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Swedish/nouns/query_nouns.sparql
@@ -4,14 +4,14 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomIndefSingular
-  ?nomIndefPlural
-  ?genIndefSingular
-  ?genIndefPlural
-  ?nomDefSingular
-  ?nomDefPlural
-  ?genDefSingular
-  ?genDefPlural
+  ?nominativeIndefiniteSingular
+  ?nominativeIndefinitePlural
+  ?genitiveIndefiniteSingular
+  ?genitiveIndefinitePlural
+  ?nominativeDefiniteSingular
+  ?nominativeDefinitePlural
+  ?genitiveDefiniteSingular
+  ?genitiveDefinitePlural
   ?gender
 
 WHERE {
@@ -21,48 +21,52 @@ WHERE {
   # MARK: Indefinite
 
   OPTIONAL {
-    # Nominative Singular
-    ?lexeme ontolex:lexicalForm ?nomIndefSingularForm .
-    ?nomIndefSingularForm ontolex:representation ?nomIndefSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeIndefiniteSingularForm .
+    ?nominativeIndefiniteSingularForm ontolex:representation ?nominativeIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q53997857, wd:Q131105, wd:Q110786 .
+  }
 
-    # Nominative Plural
-    ?lexeme ontolex:lexicalForm ?nomIndefPluralForm .
-    ?nomIndefPluralForm ontolex:representation ?nomIndefPlural ;
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nominativeIndefinitePluralForm .
+    ?nominativeIndefinitePluralForm ontolex:representation ?nominativeIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q53997857, wd:Q131105, wd:Q146786 .
+  }
 
-    # Genitive Singular
-    ?lexeme ontolex:lexicalForm ?genIndefSingularForm .
-    ?genIndefSingularForm ontolex:representation ?genIndefSingular ;
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveIndefiniteSingularForm .
+    ?genitiveIndefiniteSingularForm ontolex:representation ?genitiveIndefiniteSingular ;
       wikibase:grammaticalFeature wd:Q53997857, wd:Q146233, wd:Q110786 .
+  }
 
-    # Genitive Plural
-    ?lexeme ontolex:lexicalForm ?genIndefPluralForm .
-    ?genIndefPluralForm ontolex:representation ?genIndefPlural ;
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveIndefinitePluralForm .
+    ?genitiveIndefinitePluralForm ontolex:representation ?genitiveIndefinitePlural ;
       wikibase:grammaticalFeature wd:Q53997857, wd:Q146233, wd:Q146786 .
   }
 
   # MARK: Definite
 
   OPTIONAL {
-    # Nominative Singular
-    ?lexeme ontolex:lexicalForm ?nomDefSingularForm .
-    ?nomDefSingularForm ontolex:representation ?nomDefSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeDefiniteSingularForm .
+    ?nominativeDefiniteSingularForm ontolex:representation ?nominativeDefiniteSingular ;
       wikibase:grammaticalFeature wd:Q53997851, wd:Q131105, wd:Q110786 .
+  }
 
-    # Nominative Plural
-    ?lexeme ontolex:lexicalForm ?nomDefPluralForm .
-    ?nomDefPluralForm ontolex:representation ?nomDefPlural ;
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nominativeDefinitePluralForm .
+    ?nominativeDefinitePluralForm ontolex:representation ?nominativeDefinitePlural ;
       wikibase:grammaticalFeature wd:Q53997851, wd:Q131105, wd:Q146786 .
+  }
 
-    # Genitive Singular
-    ?lexeme ontolex:lexicalForm ?genDefSingularForm .
-    ?genDefSingularForm ontolex:representation ?genDefSingular ;
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveDefiniteSingularForm .
+    ?genitiveDefiniteSingularForm ontolex:representation ?genitiveDefiniteSingular ;
       wikibase:grammaticalFeature wd:Q53997851, wd:Q146233, wd:Q110786 .
+  }
 
-    # Genitive Plural
-    ?lexeme ontolex:lexicalForm ?genDefPluralForm .
-    ?genDefPluralForm ontolex:representation ?genDefPlural ;
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?genitiveDefinitePluralForm .
+    ?genitiveDefinitePluralForm ontolex:representation ?genitiveDefinitePlural ;
       wikibase:grammaticalFeature wd:Q53997851, wd:Q146233, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Tamil/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Tamil/nouns/query_nouns.sparql
index 763389549..e186f8c6a 100644
--- a/src/scribe_data/language_data_extraction/Tamil/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Tamil/nouns/query_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q5885 ;
@@ -14,16 +14,16 @@ WHERE {
   # MARK: Nominative Singular
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomSingularForm .
-    ?nomSingularForm ontolex:representation ?nomSingular ;
+    ?lexeme ontolex:lexicalForm ?nominativeSingularForm .
+    ?nominativeSingularForm ontolex:representation ?nominativeSingular ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q110786 .
   }
 
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Tamil/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Tamil/proper_nouns/query_proper_nouns.sparql
index 7537806c3..9d225f60c 100644
--- a/src/scribe_data/language_data_extraction/Tamil/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Tamil/proper_nouns/query_proper_nouns.sparql
@@ -5,7 +5,7 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?properNoun
-  ?nomPlural
+  ?nominativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q5885 ;
@@ -15,8 +15,8 @@ WHERE {
   # MARK: Nominative Plural
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Ukrainian/adjectives/query_adjectives.sparql b/src/scribe_data/language_data_extraction/Ukrainian/adjectives/query_adjectives.sparql
index 62f5dde64..ce6fe0d84 100644
--- a/src/scribe_data/language_data_extraction/Ukrainian/adjectives/query_adjectives.sparql
+++ b/src/scribe_data/language_data_extraction/Ukrainian/adjectives/query_adjectives.sparql
@@ -5,12 +5,12 @@
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?lemma
-  ?feminineSingularNominative
-  ?masculineSingularNominative
-  ?neuterSingularNominative
-  ?pluralNominative
-  ?comparativeForm
-  ?superlativeForm
+  ?nominativeFeminineSingular
+  ?nominativeMasculineSingular
+  ?nominativeNeuterSingular
+  ?nominativePlural
+  ?comparative
+  ?superlative
 
 WHERE {
   ?lexeme dct:language wd:Q8798 ;
@@ -18,38 +18,38 @@ WHERE {
     wikibase:lemma ?lemma .
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?feminineSingularNominativeForm .
-    ?feminineSingularNominativeForm ontolex:representation ?feminineSingularNominative ;
+    ?lexeme ontolex:lexicalForm ?nominativeFeminineSingularForm .
+    ?nominativeFeminineSingularForm ontolex:representation ?nominativeFeminineSingular ;
       wikibase:grammaticalFeature wd:Q1775415, wd:Q110786, wd:Q131105 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?masculineSingularNominativeForm .
-    ?masculineSingularNominativeForm ontolex:representation ?masculineSingularNominative ;
+    ?lexeme ontolex:lexicalForm ?nominativeMasculineSingularForm .
+    ?nominativeMasculineSingularForm ontolex:representation ?nominativeMasculineSingular ;
       wikibase:grammaticalFeature wd:Q499327, wd:Q110786, wd:Q131105 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?neuterSingularNominativeForm .
-    ?neuterSingularNominativeForm ontolex:representation ?neuterSingularNominative ;
+    ?lexeme ontolex:lexicalForm ?nominativeNeuterSingularForm .
+    ?nominativeNeuterSingularForm ontolex:representation ?nominativeNeuterSingular ;
       wikibase:grammaticalFeature wd:Q1775461, wd:Q110786, wd:Q131105 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pluralNominativeForm .
-    ?pluralNominativeForm ontolex:representation ?pluralNominative ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q146786, wd:Q131105 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?comparativeFormForm .
-    ?comparativeFormForm ontolex:representation ?comparativeForm ;
+    ?lexeme ontolex:lexicalForm ?comparativeForm .
+    ?comparativeForm ontolex:representation ?comparative ;
       wikibase:grammaticalFeature wd:Q14169499 .
   }
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?superlativeFormForm .
-    ?superlativeFormForm ontolex:representation ?superlativeForm ;
+    ?lexeme ontolex:lexicalForm ?superlativeForm .
+    ?superlativeForm ontolex:representation ?superlative ;
       wikibase:grammaticalFeature wd:Q1817208 .
   }
 }
diff --git a/src/scribe_data/language_data_extraction/Ukrainian/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Ukrainian/nouns/query_nouns.sparql
index 3fa118f0a..a7921bd83 100644
--- a/src/scribe_data/language_data_extraction/Ukrainian/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Ukrainian/nouns/query_nouns.sparql
@@ -4,8 +4,8 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
-  ?nomPlural
+  ?nominativeSingular
+  ?nominativePlural
   ?genitiveSingular
   ?dativeSingular
   ?accusativeSingular
@@ -16,13 +16,13 @@ SELECT
 WHERE {
   ?lexeme dct:language wd:Q8798 ;
     wikibase:lexicalCategory wd:Q1084 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Nominative
 
   OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nomPluralForm .
-    ?nomPluralForm ontolex:representation ?nomPlural ;
+    ?lexeme ontolex:lexicalForm ?nominativePluralForm .
+    ?nominativePluralForm ontolex:representation ?nominativePlural ;
       wikibase:grammaticalFeature wd:Q131105, wd:Q146786 .
   }
 
diff --git a/src/scribe_data/language_data_extraction/Ukrainian/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Ukrainian/proper_nouns/query_proper_nouns.sparql
index 6685cec3e..bda6fdf67 100644
--- a/src/scribe_data/language_data_extraction/Ukrainian/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Ukrainian/proper_nouns/query_proper_nouns.sparql
@@ -4,7 +4,7 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?nomSingular
+  ?nominativeSingular
   ?genitiveSingular
   ?dativeSingular
   ?accusativeSingular
@@ -16,7 +16,7 @@ SELECT
 WHERE {
   ?lexeme dct:language wd:Q8798 ;
     wikibase:lexicalCategory wd:Q147276 ;
-    wikibase:lemma ?nomSingular .
+    wikibase:lemma ?nominativeSingular .
 
   # MARK: Genitive
 
diff --git a/src/scribe_data/resources/lexeme_form_metadata.json b/src/scribe_data/resources/lexeme_form_metadata.json
index 9e2e6c60a..70f529aa0 100644
--- a/src/scribe_data/resources/lexeme_form_metadata.json
+++ b/src/scribe_data/resources/lexeme_form_metadata.json
@@ -1,77 +1,271 @@
 {
-  "1_case": {
-    "1": {
+  "01_case": {
+    "01": {
       "label": "Nominative",
       "qid": "Q131105"
     },
-    "2": {
+    "02": {
       "label": "Genitive",
       "qid": "Q146233"
     },
-    "3": {
+    "03": {
       "label": "Dative",
       "qid": "Q145599"
     },
-    "4": {
+    "04": {
       "label": "Accusative",
       "qid": "Q146078"
     },
-    "5": {
+    "05": {
       "label": "Instrumental",
       "qid": "Q192997"
     },
-    "6": {
+    "06": {
       "label": "Prepositional",
       "qid": "Q2114906"
     },
-    "7": {
+    "07": {
       "label": "Locative",
       "qid": "Q202142"
     },
-    "8": {
+    "08": {
       "label": "Vocative",
       "qid": "Q185077"
+    },
+    "09": {
+      "label": "Absolutive",
+      "qid": "Q332734"
+    },
+    "10": {
+      "label": "Pausal",
+      "qid": "Q117262361"
+    },
+    "11": {
+      "label": "Direct",
+      "qid": "Q1751855"
+    },
+    "12": {
+      "label": "Oblique",
+      "qid": "Q1233197"
+    },
+    "13": {
+      "label": "Volitive",
+      "qid": "Q2532941"
+    },
+    "14": {
+      "label": "Ablative",
+      "qid": "Q156986"
+    },
+    "15": {
+      "label": "Partitive",
+      "qid": "Q857325"
+    },
+    "16": {
+      "label": "Illative",
+      "qid": "Q474668"
+    },
+    "17": {
+      "label": "Inessive",
+      "qid": "Q282031"
+    },
+    "18": {
+      "label": "Elative",
+      "qid": "Q394253"
+    },
+    "19": {
+      "label": "Allative",
+      "qid": "Q655020"
+    },
+    "20": {
+      "label": "Adessive",
+      "qid": "Q281954"
+    },
+    "21": {
+      "label": "Translative",
+      "qid": "Q950170"
+    },
+    "22": {
+      "label": "Terminative",
+      "qid": "Q747019"
+    },
+    "23": {
+      "label": "Essive",
+      "qid": "Q148465"
+    },
+    "24": {
+      "label": "Abessive",
+      "qid": "Q319822"
+    },
+    "25": {
+      "label": "Comitative",
+      "qid": "Q838581"
     }
   },
-  "2_gender": {
-    "1": {
+  "02_gender": {
+    "01": {
       "label": "Feminine",
       "qid": "Q1775415"
     },
-    "2": {
+    "02": {
       "label": "Masculine",
       "qid": "Q499327"
     },
-    "3": {
+    "03": {
+      "label": "Inanimate",
+      "qid": "Q51927539"
+    },
+    "04": {
+      "label": "Animate",
+      "qid": "Q51927507"
+    },
+    "05": {
+      "label": "MasculineInanimate",
+      "qid": "Q52943434"
+    },
+    "06": {
+      "label": "MasculineAnimate",
+      "qid": "Q54020116"
+    },
+    "07": {
+      "label": "MasculinePersonal",
+      "qid": "Q27918551"
+    },
+    "08": {
+      "label": "NotMasculinePersonal",
+      "qid": "Q54152717"
+    },
+    "09": {
       "label": "Common",
       "qid": "Q1305037"
     },
-    "4": {
+    "10": {
       "label": "Neuter",
       "qid": "Q1775461"
     }
   },
-  "3_mood": {
+  "03_mood": {
     "1": {
       "label": "Indicative",
       "qid": "Q682111"
+    },
+    "2": {
+      "label": "Passive",
+      "qid": "Q1194697"
+    },
+    "3": {
+      "label": "Active",
+      "qid": "Q1317831"
+    },
+    "4": {
+      "label": "Imperative",
+      "qid": "Q22716"
+    },
+    "5": {
+      "label": "Performative",
+      "qid": "Q124351233"
+    },
+    "6": {
+      "label": "Conditional",
+      "qid": "Q625581"
     }
   },
-  "4_tense": {
-    "1": {
+  "04_tense": {
+    "01": {
+      "label": "Infinitive",
+      "qid": "Q179230"
+    },
+    "02": {
+      "label": "AInfinitive",
+      "qid": "Q115223950"
+    },
+    "03": {
+      "label": "EInfinitive",
+      "qid": "Q115223951"
+    },
+    "04": {
       "label": "Present",
       "qid": "Q192613"
     },
-    "2": {
+    "05": {
+      "label": "SimplePresent",
+      "qid": "Q3910936"
+    },
+    "06": {
+      "label": "PresentInfinitive",
+      "qid": "Q52434245"
+    },
+    "07": {
+      "label": "PresentContinuous",
+      "qid": "Q7240943"
+    },
+    "08": {
+      "label": "Past",
+      "qid": "Q1994301"
+    },
+    "09": {
+      "label": "SimplePast",
+      "qid": "Q1392475"
+    },
+    "10": {
       "label": "Preterite",
       "qid": "Q442485"
     },
-    "3": {
+    "11": {
       "label": "Future",
       "qid": "Q501405"
+    },
+    "12": {
+      "label": "SimpleFuture",
+      "qid": "Q1475560"
+    },
+    "13": {
+      "label": "Perfect",
+      "qid": "Q1240211"
+    },
+    "14": {
+      "label": "Perfect",
+      "qid": "Q625420"
+    },
+    "15": {
+      "label": "PresentPerfect",
+      "qid": "Q1240211"
+    },
+    "16": {
+      "label": "PresentIndicative",
+      "qid": "Q56682909"
+    },
+    "17": {
+      "label": "Imperfect",
+      "qid": "Q108524486"
+    },
+    "18": {
+      "label": "PastImperfect",
+      "qid": "Q12547192"
+    },
+    "19": {
+      "label": "PastPerfect",
+      "qid": "Q64005357"
+    },
+    "20": {
+      "label": "Pluperfect",
+      "qid": "Q623742"
+    },
+    "21": {
+      "label": "PastTransgressive",
+      "qid": "Q12750232"
     }
   },
-  "5_person": {
+  "05_phase": {
+    "1": {
+      "label": "IntransitivePhase",
+      "qid": "Q113330736"
+    },
+    "2": {
+      "label": "BasicPhase",
+      "qid": "Q113330960"
+    }
+  },
+  "06_person": {
     "1": {
       "label": "FirstPerson",
       "qid": "Q21714344"
@@ -83,16 +277,148 @@
     "3": {
       "label": "ThirdPerson",
       "qid": "Q51929074"
+    },
+    "4": {
+      "label": "Negative",
+      "qid": "Q15737187"
+    },
+    "5": {
+      "label": "Conjunctive",
+      "qid": "Q2888577"
+    },
+    "6": {
+      "label": "Imperfective",
+      "qid": "Q2898727"
+    },
+    "7": {
+      "label": "Attributive",
+      "qid": "Q53608953"
+    },
+    "8": {
+      "label": "Hypothetical",
+      "qid": "Q53609593"
     }
   },
-  "6_number": {
+  "07_definiteness": {
     "1": {
+      "label": "Indefinite",
+      "qid": "Q53997857"
+    },
+    "2": {
+      "label": "Definite",
+      "qid": "Q53997851"
+    }
+  },
+  "08_number": {
+    "01": {
       "label": "Singular",
       "qid": "Q110786"
     },
-    "2": {
+    "02": {
       "label": "Plural",
       "qid": "Q146786"
+    },
+    "03": {
+      "label": "Dual",
+      "qid": "Q110022"
+    },
+    "04": {
+      "label": "Gerund",
+      "qid": "Q1923028"
+    },
+    "05": {
+      "label": "Imperfective",
+      "qid": "Q54556033"
+    },
+    "06": {
+      "label": "Nominalized",
+      "qid": "Q74674960"
+    },
+    "07": {
+      "label": "Supine",
+      "qid": "Q548470"
+    },
+    "08": {
+      "label": "Construct",
+      "qid": "Q1641446"
+    },
+    "09": {
+      "label": "Participle",
+      "qid": "Q814722"
+    },
+    "10": {
+      "label": "PresentParticiple",
+      "qid": "Q10345583"
+    },
+    "11": {
+      "label": "PastParticiple",
+      "qid": "Q12717679"
+    },
+    "12": {
+      "label": "PastParticiple",
+      "qid": "Q1230649"
+    },
+    "13": {
+      "label": "PassiveParticiple",
+      "qid": "Q72249544"
+    },
+    "14": {
+      "label": "ActiveParticiple",
+      "qid": "Q72249355"
+    },
+    "15": {
+      "label": "ConjunctiveParticiple",
+      "qid": "Q113133303"
+    },
+    "16": {
+      "label": "Adverbial",
+      "qid": "Q380012"
+    },
+    "17": {
+      "label": "AdverbialLocation",
+      "qid": "Q5978303"
+    },
+    "18": {
+      "label": "AdverbOfManner",
+      "qid": "Q113320444"
+    },
+    "19": {
+      "label": "LocativeAdverb",
+      "qid": "Q1522423"
+    },
+    "20": {
+      "label": "AbsoluteConstruction",
+      "qid": "Q4669807"
+    },
+    "21": {
+      "label": "Phrase",
+      "qid": "Q187931"
+    },
+    "22": {
+      "label": "FiilMudari",
+      "qid": "Q12230930"
+    },
+    "23": {
+      "label": "Contraction",
+      "qid": "Q126473"
+    },
+    "24": {
+      "label": "Short",
+      "qid": "Q4239848"
+    }
+  },
+  "09_degree": {
+    "1": {
+      "label": "Comparative",
+      "qid": "Q14169499"
+    },
+    "2": {
+      "label": "Superlative",
+      "qid": "Q1817208"
+    },
+    "3": {
+      "label": "Positive",
+      "qid": "Q3482678"
     }
   }
 }