diff --git a/src/scribe_data/language_data_extraction/Igbo/adjectives/adjective_query.sparql b/src/scribe_data/language_data_extraction/Igbo/adjectives/query_adjectives.sparql
similarity index 98%
rename from src/scribe_data/language_data_extraction/Igbo/adjectives/adjective_query.sparql
rename to src/scribe_data/language_data_extraction/Igbo/adjectives/query_adjectives.sparql
index 946926b16..fc808b3dc 100644
--- a/src/scribe_data/language_data_extraction/Igbo/adjectives/adjective_query.sparql
+++ b/src/scribe_data/language_data_extraction/Igbo/adjectives/query_adjectives.sparql
@@ -1,5 +1,5 @@
 # tool: scribe-data
-# Igbo adjective and their corresponding grammatical features.
+# Igbo (Q33578) adjective (Q34698) and their corresponding grammatical features.
 # Enter this query at https://query.wikidata.org/
 
 SELECT
diff --git a/src/scribe_data/language_data_extraction/Igbo/adverbs/adverb_query.sparql b/src/scribe_data/language_data_extraction/Igbo/adverbs/adverb_query.sparql
deleted file mode 100644
index 176e5cc16..000000000
--- a/src/scribe_data/language_data_extraction/Igbo/adverbs/adverb_query.sparql
+++ /dev/null
@@ -1,69 +0,0 @@
-# tool: scribe-data
-# Igbo adverbs and their corresponding grammatical features.
-# Enter this query at https://query.wikidata.org/
-
-SELECT
-  (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?adverb
-  ?adverbialPhrase
-  ?pastParticiple
-  ?synonym
-  ?adverbial
-  ?determiner
-  ?futureTense
-  ?noun
-WHERE {
-  ?lexeme dct:language wd:Q33578 ;
-          wikibase:lexicalCategory wd:Q380057 ;
-          wikibase:lemma ?adverb .
-
-  # MARK: Adverbial phrases
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?adverbialPhraseForm .
-    ?adverbialPhraseForm ontolex:representation ?adverbialPhrase ;
-      wikibase:grammaticalFeature wd:Q3734650 .
-  }
-
-  # MARK: Past participles
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?pastParticipleForm .
-    ?pastParticipleForm ontolex:representation ?pastParticiple ;
-      wikibase:grammaticalFeature wd:Q12717679 .
-  }
-
-  # MARK: Synonyms
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?synonymForm .
-    ?synonymForm ontolex:representation ?synonym ;
-      wikibase:grammaticalFeature wd:Q42106 .
-  }
-
-  # MARK: Adverbials
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?adverbialForm .
-    ?adverbialForm ontolex:representation ?adverbial ;
-      wikibase:grammaticalFeature wd:Q380012.
-  }
-
-  # MARK: Determiners
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?determinerForm .
-    ?determinerForm ontolex:representation ?determiner ;
-      wikibase:grammaticalFeature wd:Q576271 .
-  }
-
-  # MARK: Future tense forms
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?futureTenseForm .
-    ?futureTenseForm ontolex:representation ?futureTense ;
-      wikibase:grammaticalFeature wd:Q501405 .
-  }
-
-  # MARK: Nouns
-  OPTIONAL {
-    ?lexeme ontolex:lexicalForm ?nounForm .
-    ?nounForm ontolex:representation ?noun ;
-      wikibase:grammaticalFeature wd:Q1084 .
-  }
-
-}
diff --git a/src/scribe_data/language_data_extraction/Igbo/adverbs/query_adverbs.sparql b/src/scribe_data/language_data_extraction/Igbo/adverbs/query_adverbs.sparql
index 6d3717bcb..7ed8c8765 100644
--- a/src/scribe_data/language_data_extraction/Igbo/adverbs/query_adverbs.sparql
+++ b/src/scribe_data/language_data_extraction/Igbo/adverbs/query_adverbs.sparql
@@ -1,13 +1,69 @@
 # tool: scribe-data
-# All Igbo (Q33578) adverbs and the given forms.
-# Enter this query at https://query.wikidata.org/.
+# Igbo (Q33578) adverbs (Q380057) and their corresponding grammatical features.
+# Enter this query at https://query.wikidata.org/
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?adverb
-
+  ?adverbialPhrase
+  ?pastParticiple
+  ?synonym
+  ?adverbial
+  ?determiner
+  ?futureTense
+  ?noun
 WHERE {
   ?lexeme dct:language wd:Q33578 ;
-    wikibase:lexicalCategory wd:Q380057 ;
-    wikibase:lemma ?adverb .
+          wikibase:lexicalCategory wd:Q380057 ;
+          wikibase:lemma ?adverb .
+
+  # MARK: Adverbial phrases
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?adverbialPhraseForm .
+    ?adverbialPhraseForm ontolex:representation ?adverbialPhrase ;
+      wikibase:grammaticalFeature wd:Q3734650 .
+  }
+
+  # MARK: Past participles
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastParticipleForm .
+    ?pastParticipleForm ontolex:representation ?pastParticiple ;
+      wikibase:grammaticalFeature wd:Q12717679 .
+  }
+
+  # MARK: Synonyms
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?synonymForm .
+    ?synonymForm ontolex:representation ?synonym ;
+      wikibase:grammaticalFeature wd:Q42106 .
+  }
+
+  # MARK: Adverbials
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?adverbialForm .
+    ?adverbialForm ontolex:representation ?adverbial ;
+      wikibase:grammaticalFeature wd:Q380012.
+  }
+
+  # MARK: Determiners
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?determinerForm .
+    ?determinerForm ontolex:representation ?determiner ;
+      wikibase:grammaticalFeature wd:Q576271 .
+  }
+
+  # MARK: Future tense forms
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?futureTenseForm .
+    ?futureTenseForm ontolex:representation ?futureTense ;
+      wikibase:grammaticalFeature wd:Q501405 .
+  }
+
+  # MARK: Nouns
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?nounForm .
+    ?nounForm ontolex:representation ?noun ;
+      wikibase:grammaticalFeature wd:Q1084 .
+  }
+
 }
diff --git a/src/scribe_data/language_data_extraction/Igbo/nouns/noun_query_1.sparql b/src/scribe_data/language_data_extraction/Igbo/nouns/query_nouns_1.sparql
similarity index 98%
rename from src/scribe_data/language_data_extraction/Igbo/nouns/noun_query_1.sparql
rename to src/scribe_data/language_data_extraction/Igbo/nouns/query_nouns_1.sparql
index 1f2c67db5..30d007bda 100644
--- a/src/scribe_data/language_data_extraction/Igbo/nouns/noun_query_1.sparql
+++ b/src/scribe_data/language_data_extraction/Igbo/nouns/query_nouns_1.sparql
@@ -1,5 +1,5 @@
 # tool: scribe-data
-# Igbo nouns and their grammatical features.
+# Igbo (Q33578) nouns (Q1084) and their grammatical features.
 # Enter this query at https://query.wikidata.org/
 
 SELECT
diff --git a/src/scribe_data/language_data_extraction/Igbo/nouns/noun_query_2.sparql b/src/scribe_data/language_data_extraction/Igbo/nouns/query_nouns_2.sparql
similarity index 97%
rename from src/scribe_data/language_data_extraction/Igbo/nouns/noun_query_2.sparql
rename to src/scribe_data/language_data_extraction/Igbo/nouns/query_nouns_2.sparql
index 70bfe9479..5a641c8fe 100644
--- a/src/scribe_data/language_data_extraction/Igbo/nouns/noun_query_2.sparql
+++ b/src/scribe_data/language_data_extraction/Igbo/nouns/query_nouns_2.sparql
@@ -1,5 +1,5 @@
 # tool: scribe-data
-# Igbo nouns and their corresponding grammatical features.
+# Igbo (Q33578) nouns (Q1084) and their corresponding grammatical features.
 # Enter this query at https://query.wikidata.org/
 
 SELECT
diff --git a/src/scribe_data/language_data_extraction/Igbo/prepositions/preposition_query.sparql b/src/scribe_data/language_data_extraction/Igbo/prepositions/query_prepositions.sparql
similarity index 89%
rename from src/scribe_data/language_data_extraction/Igbo/prepositions/preposition_query.sparql
rename to src/scribe_data/language_data_extraction/Igbo/prepositions/query_prepositions.sparql
index 6bfe7063b..7d065be5b 100644
--- a/src/scribe_data/language_data_extraction/Igbo/prepositions/preposition_query.sparql
+++ b/src/scribe_data/language_data_extraction/Igbo/prepositions/query_prepositions.sparql
@@ -1,5 +1,5 @@
 # tool: scribe-data
-# Igbo preposition and their corresponding grammatical features.
+# Igbo (Q33578) preposition (Q4833830) and their corresponding grammatical features.
 # Enter this query at https://query.wikidata.org/
 
 SELECT