diff --git a/src/035-understanding-the-compiler/112-unions-of-functions.problem.ts b/src/035-understanding-the-compiler/112-enums.problem.ts
similarity index 100%
rename from src/035-understanding-the-compiler/112-unions-of-functions.problem.ts
rename to src/035-understanding-the-compiler/112-enums.problem.ts
diff --git a/src/035-understanding-the-compiler/112-unions-of-functions.solution.ts b/src/035-understanding-the-compiler/112-enums.solution.ts
similarity index 100%
rename from src/035-understanding-the-compiler/112-unions-of-functions.solution.ts
rename to src/035-understanding-the-compiler/112-enums.solution.ts
diff --git a/src/035-understanding-the-compiler/113-empty-object-type.problem.ts b/src/035-understanding-the-compiler/113-const-enums.problem.ts
similarity index 100%
rename from src/035-understanding-the-compiler/113-empty-object-type.problem.ts
rename to src/035-understanding-the-compiler/113-const-enums.problem.ts
diff --git a/src/035-understanding-the-compiler/113-empty-object-type.solution.ts b/src/035-understanding-the-compiler/113-const-enums.solution.ts
similarity index 100%
rename from src/035-understanding-the-compiler/113-empty-object-type.solution.ts
rename to src/035-understanding-the-compiler/113-const-enums.solution.ts
diff --git a/src/040-deriving-types-from-values/114-typeof-keyword.problem.ts b/src/035-understanding-the-compiler/114-unions-of-functions.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/114-typeof-keyword.problem.ts
rename to src/035-understanding-the-compiler/114-unions-of-functions.problem.ts
diff --git a/src/040-deriving-types-from-values/114-typeof-keyword.solution.ts b/src/035-understanding-the-compiler/114-unions-of-functions.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/114-typeof-keyword.solution.ts
rename to src/035-understanding-the-compiler/114-unions-of-functions.solution.ts
diff --git a/src/040-deriving-types-from-values/115-create-runtime-values-from-types.problem.ts b/src/035-understanding-the-compiler/115-empty-object-type.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/115-create-runtime-values-from-types.problem.ts
rename to src/035-understanding-the-compiler/115-empty-object-type.problem.ts
diff --git a/src/040-deriving-types-from-values/115-create-runtime-values-from-types.solution.ts b/src/035-understanding-the-compiler/115-empty-object-type.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/115-create-runtime-values-from-types.solution.ts
rename to src/035-understanding-the-compiler/115-empty-object-type.solution.ts
diff --git a/src/040-deriving-types-from-values/116-classes-and-enums-cross-value-and-type-world.problem.ts b/src/040-deriving-types-from-values/116-typeof-keyword.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/116-classes-and-enums-cross-value-and-type-world.problem.ts
rename to src/040-deriving-types-from-values/116-typeof-keyword.problem.ts
diff --git a/src/040-deriving-types-from-values/116-classes-and-enums-cross-value-and-type-world.solution.ts b/src/040-deriving-types-from-values/116-typeof-keyword.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/116-classes-and-enums-cross-value-and-type-world.solution.ts
rename to src/040-deriving-types-from-values/116-typeof-keyword.solution.ts
diff --git a/src/040-deriving-types-from-values/117-return-type.problem.ts b/src/040-deriving-types-from-values/117-create-runtime-values-from-types.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/117-return-type.problem.ts
rename to src/040-deriving-types-from-values/117-create-runtime-values-from-types.problem.ts
diff --git a/src/040-deriving-types-from-values/117-return-type.solution.ts b/src/040-deriving-types-from-values/117-create-runtime-values-from-types.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/117-return-type.solution.ts
rename to src/040-deriving-types-from-values/117-create-runtime-values-from-types.solution.ts
diff --git a/src/040-deriving-types-from-values/118-parameters-type-helper.problem.ts b/src/040-deriving-types-from-values/118-classes-and-enums-cross-value-and-type-world.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/118-parameters-type-helper.problem.ts
rename to src/040-deriving-types-from-values/118-classes-and-enums-cross-value-and-type-world.problem.ts
diff --git a/src/040-deriving-types-from-values/118-parameters-type-helper.solution.ts b/src/040-deriving-types-from-values/118-classes-and-enums-cross-value-and-type-world.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/118-parameters-type-helper.solution.ts
rename to src/040-deriving-types-from-values/118-classes-and-enums-cross-value-and-type-world.solution.ts
diff --git a/src/040-deriving-types-from-values/119-keyof.problem.ts b/src/040-deriving-types-from-values/119-return-type.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/119-keyof.problem.ts
rename to src/040-deriving-types-from-values/119-return-type.problem.ts
diff --git a/src/040-deriving-types-from-values/119-keyof.solution.ts b/src/040-deriving-types-from-values/119-return-type.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/119-keyof.solution.ts
rename to src/040-deriving-types-from-values/119-return-type.solution.ts
diff --git a/src/040-deriving-types-from-values/120-indexed-access-types.problem.ts b/src/040-deriving-types-from-values/120-parameters-type-helper.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/120-indexed-access-types.problem.ts
rename to src/040-deriving-types-from-values/120-parameters-type-helper.problem.ts
diff --git a/src/040-deriving-types-from-values/120-indexed-access-types.solution.ts b/src/040-deriving-types-from-values/120-parameters-type-helper.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/120-indexed-access-types.solution.ts
rename to src/040-deriving-types-from-values/120-parameters-type-helper.solution.ts
diff --git a/src/040-deriving-types-from-values/121-pass-unions-to-indexed-access-types.problem.ts b/src/040-deriving-types-from-values/121-keyof.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/121-pass-unions-to-indexed-access-types.problem.ts
rename to src/040-deriving-types-from-values/121-keyof.problem.ts
diff --git a/src/040-deriving-types-from-values/121-pass-unions-to-indexed-access-types.solution.ts b/src/040-deriving-types-from-values/121-keyof.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/121-pass-unions-to-indexed-access-types.solution.ts
rename to src/040-deriving-types-from-values/121-keyof.solution.ts
diff --git a/src/040-deriving-types-from-values/122-pass-keyof-into-an-indexed-access-type.problem.ts b/src/040-deriving-types-from-values/122-indexed-access-types.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/122-pass-keyof-into-an-indexed-access-type.problem.ts
rename to src/040-deriving-types-from-values/122-indexed-access-types.problem.ts
diff --git a/src/040-deriving-types-from-values/122-pass-keyof-into-an-indexed-access-type.solution.ts b/src/040-deriving-types-from-values/122-indexed-access-types.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/122-pass-keyof-into-an-indexed-access-type.solution.ts
rename to src/040-deriving-types-from-values/122-indexed-access-types.solution.ts
diff --git a/src/040-deriving-types-from-values/123-create-an-enum-from-as-const-object.problem.ts b/src/040-deriving-types-from-values/123-pass-unions-to-indexed-access-types.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/123-create-an-enum-from-as-const-object.problem.ts
rename to src/040-deriving-types-from-values/123-pass-unions-to-indexed-access-types.problem.ts
diff --git a/src/040-deriving-types-from-values/123-create-an-enum-from-as-const-object.solution.ts b/src/040-deriving-types-from-values/123-pass-unions-to-indexed-access-types.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/123-create-an-enum-from-as-const-object.solution.ts
rename to src/040-deriving-types-from-values/123-pass-unions-to-indexed-access-types.solution.ts
diff --git a/src/040-deriving-types-from-values/124-create-a-union-from-an-as-const-array.problem.ts b/src/040-deriving-types-from-values/124-pass-keyof-into-an-indexed-access-type.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/124-create-a-union-from-an-as-const-array.problem.ts
rename to src/040-deriving-types-from-values/124-pass-keyof-into-an-indexed-access-type.problem.ts
diff --git a/src/040-deriving-types-from-values/124-create-a-union-from-an-as-const-array.solution.ts b/src/040-deriving-types-from-values/124-pass-keyof-into-an-indexed-access-type.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/124-create-a-union-from-an-as-const-array.solution.ts
rename to src/040-deriving-types-from-values/124-pass-keyof-into-an-indexed-access-type.solution.ts
diff --git a/src/040-deriving-types-from-values/125-should-i-use-enums-or-as-const.problem.ts b/src/040-deriving-types-from-values/125-create-an-enum-from-as-const-object.problem.ts
similarity index 100%
rename from src/040-deriving-types-from-values/125-should-i-use-enums-or-as-const.problem.ts
rename to src/040-deriving-types-from-values/125-create-an-enum-from-as-const-object.problem.ts
diff --git a/src/040-deriving-types-from-values/125-should-i-use-enums-or-as-const.solution.ts b/src/040-deriving-types-from-values/125-create-an-enum-from-as-const-object.solution.ts
similarity index 100%
rename from src/040-deriving-types-from-values/125-should-i-use-enums-or-as-const.solution.ts
rename to src/040-deriving-types-from-values/125-create-an-enum-from-as-const-object.solution.ts
diff --git a/src/040-deriving-types-from-values/126-create-a-union-from-an-as-const-array.problem.ts b/src/040-deriving-types-from-values/126-create-a-union-from-an-as-const-array.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/040-deriving-types-from-values/126-create-a-union-from-an-as-const-array.solution.ts b/src/040-deriving-types-from-values/126-create-a-union-from-an-as-const-array.solution.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/040-deriving-types-from-values/127-should-i-use-enums-or-as-const.problem.ts b/src/040-deriving-types-from-values/127-should-i-use-enums-or-as-const.problem.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/040-deriving-types-from-values/127-should-i-use-enums-or-as-const.solution.ts b/src/040-deriving-types-from-values/127-should-i-use-enums-or-as-const.solution.ts
new file mode 100644
index 0000000..e69de29