diff --git a/exercises/02.composition/01.problem/README.mdx b/exercises/01.composition/01.problem.compose/README.mdx
similarity index 100%
rename from exercises/02.composition/01.problem/README.mdx
rename to exercises/01.composition/01.problem.compose/README.mdx
diff --git a/exercises/02.composition/01.problem/index.css b/exercises/01.composition/01.problem.compose/index.css
similarity index 100%
rename from exercises/02.composition/01.problem/index.css
rename to exercises/01.composition/01.problem.compose/index.css
diff --git a/exercises/02.composition/01.problem/index.tsx b/exercises/01.composition/01.problem.compose/index.tsx
similarity index 100%
rename from exercises/02.composition/01.problem/index.tsx
rename to exercises/01.composition/01.problem.compose/index.tsx
diff --git a/exercises/02.composition/01.solution/README.mdx b/exercises/01.composition/01.solution.compose/README.mdx
similarity index 100%
rename from exercises/02.composition/01.solution/README.mdx
rename to exercises/01.composition/01.solution.compose/README.mdx
diff --git a/exercises/02.composition/01.solution/index.css b/exercises/01.composition/01.solution.compose/index.css
similarity index 100%
rename from exercises/02.composition/01.solution/index.css
rename to exercises/01.composition/01.solution.compose/index.css
diff --git a/exercises/02.composition/01.solution/index.tsx b/exercises/01.composition/01.solution.compose/index.tsx
similarity index 100%
rename from exercises/02.composition/01.solution/index.tsx
rename to exercises/01.composition/01.solution.compose/index.tsx
diff --git a/exercises/02.composition/01.solution/ui-still-works.test.tsx b/exercises/01.composition/01.solution.compose/ui-still-works.test.tsx
similarity index 100%
rename from exercises/02.composition/01.solution/ui-still-works.test.tsx
rename to exercises/01.composition/01.solution.compose/ui-still-works.test.tsx
diff --git a/exercises/02.composition/FINISHED.mdx b/exercises/01.composition/FINISHED.mdx
similarity index 100%
rename from exercises/02.composition/FINISHED.mdx
rename to exercises/01.composition/FINISHED.mdx
diff --git a/exercises/02.composition/README.mdx b/exercises/01.composition/README.mdx
similarity index 100%
rename from exercises/02.composition/README.mdx
rename to exercises/01.composition/README.mdx
diff --git a/exercises/01.latest-ref/01.problem.ref/README.mdx b/exercises/02.latest-ref/01.problem.ref/README.mdx
similarity index 97%
rename from exercises/01.latest-ref/01.problem.ref/README.mdx
rename to exercises/02.latest-ref/01.problem.ref/README.mdx
index 1499030b..7f5819cd 100644
--- a/exercises/01.latest-ref/01.problem.ref/README.mdx
+++ b/exercises/02.latest-ref/01.problem.ref/README.mdx
@@ -68,7 +68,7 @@ you pass a memoized callback:
 ```ts
 // option 2:
 // ...
-const increment = useMemoCallback(() => setCount(c => c + step), [step])
+const increment = useCallback(() => setCount(c => c + step), [step])
 const debouncedIncrement = useDebounce(increment, 3000)
 // ...
 ```
diff --git a/exercises/01.latest-ref/01.problem.ref/index.tsx b/exercises/02.latest-ref/01.problem.ref/index.tsx
similarity index 95%
rename from exercises/01.latest-ref/01.problem.ref/index.tsx
rename to exercises/02.latest-ref/01.problem.ref/index.tsx
index f5e34493..9efb8112 100644
--- a/exercises/01.latest-ref/01.problem.ref/index.tsx
+++ b/exercises/02.latest-ref/01.problem.ref/index.tsx
@@ -33,7 +33,7 @@ function App() {
 
 	// 🦉 feel free to swap these two implementations and see they don't make
 	// any difference to the user experience
-	// const increment = useMemoCallback(() => setCount(c => c + step), [step])
+	// const increment = useCallback(() => setCount(c => c + step), [step])
 	const increment = () => setCount(c => c + step)
 	const debouncedIncrement = useDebounce(increment, 3000)
 	return (
diff --git a/exercises/01.latest-ref/01.solution.ref/README.mdx b/exercises/02.latest-ref/01.solution.ref/README.mdx
similarity index 100%
rename from exercises/01.latest-ref/01.solution.ref/README.mdx
rename to exercises/02.latest-ref/01.solution.ref/README.mdx
diff --git a/exercises/01.latest-ref/01.solution.ref/increments.test.tsx b/exercises/02.latest-ref/01.solution.ref/increments.test.tsx
similarity index 100%
rename from exercises/01.latest-ref/01.solution.ref/increments.test.tsx
rename to exercises/02.latest-ref/01.solution.ref/increments.test.tsx
diff --git a/exercises/01.latest-ref/01.solution.ref/index.tsx b/exercises/02.latest-ref/01.solution.ref/index.tsx
similarity index 100%
rename from exercises/01.latest-ref/01.solution.ref/index.tsx
rename to exercises/02.latest-ref/01.solution.ref/index.tsx
diff --git a/exercises/01.latest-ref/01.solution.ref/step-change.test.tsx b/exercises/02.latest-ref/01.solution.ref/step-change.test.tsx
similarity index 100%
rename from exercises/01.latest-ref/01.solution.ref/step-change.test.tsx
rename to exercises/02.latest-ref/01.solution.ref/step-change.test.tsx
diff --git a/exercises/01.latest-ref/FINISHED.mdx b/exercises/02.latest-ref/FINISHED.mdx
similarity index 100%
rename from exercises/01.latest-ref/FINISHED.mdx
rename to exercises/02.latest-ref/FINISHED.mdx
diff --git a/exercises/01.latest-ref/README.mdx b/exercises/02.latest-ref/README.mdx
similarity index 100%
rename from exercises/01.latest-ref/README.mdx
rename to exercises/02.latest-ref/README.mdx