diff --git a/06-variables/05-type-conversion/exercises/01/main.go b/06-variables/05-type-conversion/exercises/01-convert-and-fix/main.go
similarity index 93%
rename from 06-variables/05-type-conversion/exercises/01/main.go
rename to 06-variables/05-type-conversion/exercises/01-convert-and-fix/main.go
index b29e63c..2f2f370 100644
--- a/06-variables/05-type-conversion/exercises/01/main.go
+++ b/06-variables/05-type-conversion/exercises/01-convert-and-fix/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Convert and Fix
+//
 //  Fix the code by using the conversion expression.
 //
 // EXPECTED OUTPUT
diff --git a/06-variables/05-type-conversion/exercises/01/solution/main.go b/06-variables/05-type-conversion/exercises/01-convert-and-fix/solution/main.go
similarity index 100%
rename from 06-variables/05-type-conversion/exercises/01/solution/main.go
rename to 06-variables/05-type-conversion/exercises/01-convert-and-fix/solution/main.go
diff --git a/06-variables/05-type-conversion/exercises/02/main.go b/06-variables/05-type-conversion/exercises/02-convert-and-fix-2/main.go
similarity index 93%
rename from 06-variables/05-type-conversion/exercises/02/main.go
rename to 06-variables/05-type-conversion/exercises/02-convert-and-fix-2/main.go
index 96c5141..d55f9c0 100644
--- a/06-variables/05-type-conversion/exercises/02/main.go
+++ b/06-variables/05-type-conversion/exercises/02-convert-and-fix-2/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Convert and Fix #2
+//
 //  Fix the code by using the conversion expression.
 //
 // EXPECTED OUTPUT
diff --git a/06-variables/05-type-conversion/exercises/02/solution/main.go b/06-variables/05-type-conversion/exercises/02-convert-and-fix-2/solution/main.go
similarity index 100%
rename from 06-variables/05-type-conversion/exercises/02/solution/main.go
rename to 06-variables/05-type-conversion/exercises/02-convert-and-fix-2/solution/main.go
diff --git a/06-variables/05-type-conversion/exercises/03/main.go b/06-variables/05-type-conversion/exercises/03-convert-and-fix-3/main.go
similarity index 92%
rename from 06-variables/05-type-conversion/exercises/03/main.go
rename to 06-variables/05-type-conversion/exercises/03-convert-and-fix-3/main.go
index 796a693..a05d46d 100644
--- a/06-variables/05-type-conversion/exercises/03/main.go
+++ b/06-variables/05-type-conversion/exercises/03-convert-and-fix-3/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Convert and Fix #3
+//
 //  Fix the code.
 //
 // EXPECTED OUTPUT
diff --git a/06-variables/05-type-conversion/exercises/03/solution/main.go b/06-variables/05-type-conversion/exercises/03-convert-and-fix-3/solution/main.go
similarity index 100%
rename from 06-variables/05-type-conversion/exercises/03/solution/main.go
rename to 06-variables/05-type-conversion/exercises/03-convert-and-fix-3/solution/main.go
diff --git a/06-variables/05-type-conversion/exercises/04/main.go b/06-variables/05-type-conversion/exercises/04-convert-and-fix-4/main.go
similarity index 92%
rename from 06-variables/05-type-conversion/exercises/04/main.go
rename to 06-variables/05-type-conversion/exercises/04-convert-and-fix-4/main.go
index 7680f0f..0ecbe2c 100644
--- a/06-variables/05-type-conversion/exercises/04/main.go
+++ b/06-variables/05-type-conversion/exercises/04-convert-and-fix-4/main.go
@@ -8,7 +8,8 @@
 package main
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Convert and Fix #4
+//
 //  Fix the code.
 //
 // EXPECTED OUTPUT
diff --git a/06-variables/05-type-conversion/exercises/04/solution/main.go b/06-variables/05-type-conversion/exercises/04-convert-and-fix-4/solution/main.go
similarity index 100%
rename from 06-variables/05-type-conversion/exercises/04/solution/main.go
rename to 06-variables/05-type-conversion/exercises/04-convert-and-fix-4/solution/main.go
diff --git a/06-variables/05-type-conversion/exercises/05/main.go b/06-variables/05-type-conversion/exercises/05-convert-and-fix-5/main.go
similarity index 94%
rename from 06-variables/05-type-conversion/exercises/05/main.go
rename to 06-variables/05-type-conversion/exercises/05-convert-and-fix-5/main.go
index 66f92d5..0401156 100644
--- a/06-variables/05-type-conversion/exercises/05/main.go
+++ b/06-variables/05-type-conversion/exercises/05-convert-and-fix-5/main.go
@@ -10,7 +10,8 @@ package main
 import "fmt"
 
 // ---------------------------------------------------------
-// EXERCISE
+// EXERCISE: Convert and Fix #5
+//
 //  Fix the code.
 //
 // HINTS
diff --git a/06-variables/05-type-conversion/exercises/05/solution/main.go b/06-variables/05-type-conversion/exercises/05-convert-and-fix-5/solution/main.go
similarity index 100%
rename from 06-variables/05-type-conversion/exercises/05/solution/main.go
rename to 06-variables/05-type-conversion/exercises/05-convert-and-fix-5/solution/main.go
diff --git a/06-variables/05-type-conversion/exercises/README.md b/06-variables/05-type-conversion/exercises/README.md
new file mode 100644
index 0000000..02bdf0d
--- /dev/null
+++ b/06-variables/05-type-conversion/exercises/README.md
@@ -0,0 +1,13 @@
+# Type Conversion
+
+Here are 5 exercises for you. You must find the errors and then fix them using the correct type conversions.
+
+1. **[Convert and Fix #1](https://github.com/inancgumus/learngo/tree/master/06-variables/05-type-conversion/exercises/01-convert-and-fix)**
+
+2. **[Convert and Fix #2](https://github.com/inancgumus/learngo/tree/master/06-variables/05-type-conversion/exercises/01-convert-and-fix-2)**
+
+3. **[Convert and Fix #3](https://github.com/inancgumus/learngo/tree/master/06-variables/05-type-conversion/exercises/01-convert-and-fix-3)**
+
+4. **[Convert and Fix #4](https://github.com/inancgumus/learngo/tree/master/06-variables/05-type-conversion/exercises/01-convert-and-fix-4)**
+
+5. **[Convert and Fix #5](https://github.com/inancgumus/learngo/tree/master/06-variables/05-type-conversion/exercises/01-convert-and-fix-5)**