diff --git a/ch17/ch17.adoc b/ch17/ch17.adoc
index 3dd3529..4fd89f6 100644
--- a/ch17/ch17.adoc
+++ b/ch17/ch17.adoc
@@ -573,7 +573,7 @@ the key to a single mode. The reason I'm not doing that is that in almost all ca
 [[hash_get_entries_count]]
 .`hash.c` - Getting the count of entries in a hash table
 ----
-include::./code/hash.multi.c[tags=hash_get_entries_count]
+include::./code/hash.c[tags=hash_get_entries_count]
 ----
 
 We haven't looked yet on how `hash_multi_del()` deals with nested hash tables. In <<hash_multi_del>> you can see that we call `hash_del()` on the nested hash table, but we aren't 
@@ -599,7 +599,7 @@ is shown in <<hash_drop_with_nesting>>.
 [[hash_drop_with_nesting]]
 .`hash.c` - Drop a hash table and all its associated tables
 ----
-include::./code/hash.multi.c[tags=hash_drop_with_nesting]
+include::./code/hash.c[tags=hash_drop_with_nesting]
 ----
 
 The first item in the linked list is the parent hash table, so we'll simply scan from the given `hash_id` and remove all the nested hash tables in the list. The bulk of the work
diff --git a/ch17/code/btree.multi.c b/ch17/code/btree.multi.c
index f0b7444..523aca6 100644
--- a/ch17/code/btree.multi.c
+++ b/ch17/code/btree.multi.c
@@ -202,7 +202,7 @@ result_t btree_multi_cursor_search(btree_cursor_t *cursor) {
 }
 // end::btree_multi_cursor_search[]
 
-// tag::btree_multi_get_next[]]
+// tag::btree_multi_get_next[]
 result_t btree_multi_get_next(btree_cursor_t *cursor) {
   if (cursor->has_val == false) return success();
   span_t k = cursor->key;
diff --git a/ch17/code/hash.c b/ch17/code/hash.c
index 8f1b242..2b4f406 100644
--- a/ch17/code/hash.c
+++ b/ch17/code/hash.c
@@ -647,7 +647,7 @@ result_t hash_del(txn_t* tx, hash_val_t* del) {
 }
 // end::hash_del[]
 
-// tag::hash_get_number_of_entries[]
+// tag::hash_get_entries_count[]
 result_t hash_get_entries_count(
     txn_t* tx, uint64_t hash_id, uint64_t* number_of_entries) {
   page_t hash_root = {0};
@@ -660,7 +660,7 @@ result_t hash_get_entries_count(
   }
   return success();
 }
-// end::hash_get_number_of_entries[]
+// end::hash_get_entries_count[]
 
 // tag::hash_get_next[]
 result_t hash_get_next(