diff --git a/go/tests/func/raid1a_test/main.go b/go/tests/func/quada_test/main.go
similarity index 91%
rename from go/tests/func/raid1a_test/main.go
rename to go/tests/func/quada_test/main.go
index 7c2f220f..a1f12efa 100644
--- a/go/tests/func/raid1a_test/main.go
+++ b/go/tests/func/quada_test/main.go
@@ -40,7 +40,7 @@ func printTheLines(x, y int, strBeg, strMed, strEnd string) {
 	}
 }
 
-func raid1a(x, y int) {
+func quadA(x, y int) {
 	if x < 1 || y < 1 {
 		return
 	}
@@ -67,7 +67,7 @@ func main() {
 	// Tests all possibilities including 0 0, -x y, x -y
 	for i := 0; i < len(table); i += 2 {
 		if i != len(table)-1 {
-			lib.Challenge("Raid1a", raid1a, student.Raid1a, table[i], table[i+1])
+			lib.Challenge("QuadA", quadA, student.QuadA, table[i], table[i+1])
 		}
 	}
 }
diff --git a/go/tests/func/raid1b_test/main.go b/go/tests/func/quadb_test/main.go
similarity index 78%
rename from go/tests/func/raid1b_test/main.go
rename to go/tests/func/quadb_test/main.go
index 966ed6b6..658d51e8 100644
--- a/go/tests/func/raid1b_test/main.go
+++ b/go/tests/func/quadb_test/main.go
@@ -8,7 +8,7 @@ import (
 	"lib"
 )
 
-func drawLineRaid1b(x int, s string) {
+func drawLineQuadB(x int, s string) {
 	beg := s[0]
 	med := s[1]
 	end := s[2]
@@ -26,7 +26,7 @@ func drawLineRaid1b(x int, s string) {
 	fmt.Println()
 }
 
-func raid1b(x, y int) {
+func quadB(x, y int) {
 	if x < 1 || y < 1 {
 		return
 	}
@@ -35,15 +35,15 @@ func raid1b(x, y int) {
 	strEnd := "\\*/"
 
 	if y >= 1 {
-		drawLineRaid1b(x, strBeg)
+		drawLineQuadB(x, strBeg)
 	}
 	if y > 2 {
 		for i := 0; i < y-2; i++ {
-			drawLineRaid1b(x, strMed)
+			drawLineQuadB(x, strMed)
 		}
 	}
 	if y > 1 {
-		drawLineRaid1b(x, strEnd)
+		drawLineQuadB(x, strEnd)
 	}
 }
 
@@ -67,7 +67,7 @@ func main() {
 	// Tests all possibilities including 0 0, -x y, x -y
 	for i := 0; i < len(table); i += 2 {
 		if i != len(table)-1 {
-			lib.Challenge("Raid1b", raid1b, student.Raid1b, table[i], table[i+1])
+			lib.Challenge("QuadB", quadB, student.QuadB, table[i], table[i+1])
 		}
 	}
 }
diff --git a/go/tests/func/raid1c_test/main.go b/go/tests/func/quadc_test/main.go
similarity index 78%
rename from go/tests/func/raid1c_test/main.go
rename to go/tests/func/quadc_test/main.go
index 7e948335..b512b50b 100644
--- a/go/tests/func/raid1c_test/main.go
+++ b/go/tests/func/quadc_test/main.go
@@ -8,7 +8,7 @@ import (
 	"lib"
 )
 
-func drawLineRaid1c(x int, s string) {
+func drawLineQuadC(x int, s string) {
 	beg := s[0]
 	med := s[1]
 	end := s[2]
@@ -26,7 +26,7 @@ func drawLineRaid1c(x int, s string) {
 	fmt.Println()
 }
 
-func raid1c(x, y int) {
+func quadC(x, y int) {
 	if x < 1 || y < 1 {
 		return
 	}
@@ -35,15 +35,15 @@ func raid1c(x, y int) {
 	strEnd := "CBC"
 
 	if y >= 1 {
-		drawLineRaid1c(x, strBeg)
+		drawLineQuadC(x, strBeg)
 	}
 	if y > 2 {
 		for i := 0; i < y-2; i++ {
-			drawLineRaid1c(x, strMed)
+			drawLineQuadC(x, strMed)
 		}
 	}
 	if y > 1 {
-		drawLineRaid1c(x, strEnd)
+		drawLineQuadC(x, strEnd)
 	}
 }
 
@@ -67,7 +67,7 @@ func main() {
 	// Tests all possibilities including 0 0, -x y, x -y
 	for i := 0; i < len(table); i += 2 {
 		if i != len(table)-1 {
-			lib.Challenge("Raid1c", raid1c, student.Raid1c, table[i], table[i+1])
+			lib.Challenge("QuadC", quadC, student.QuadC, table[i], table[i+1])
 		}
 	}
 }
diff --git a/go/tests/func/raid1d_test/main.go b/go/tests/func/quadd_test/main.go
similarity index 78%
rename from go/tests/func/raid1d_test/main.go
rename to go/tests/func/quadd_test/main.go
index 589ba7c3..f7ef33e0 100644
--- a/go/tests/func/raid1d_test/main.go
+++ b/go/tests/func/quadd_test/main.go
@@ -8,7 +8,7 @@ import (
 	"lib"
 )
 
-func drawLineRaid1d(x int, s string) {
+func drawLineQuadD(x int, s string) {
 	beg := s[0]
 	med := s[1]
 	end := s[2]
@@ -26,7 +26,7 @@ func drawLineRaid1d(x int, s string) {
 	fmt.Println()
 }
 
-func raid1d(x, y int) {
+func quadD(x, y int) {
 	if x < 1 || y < 1 {
 		return
 	}
@@ -35,15 +35,15 @@ func raid1d(x, y int) {
 	strEnd := "ABC"
 
 	if y >= 1 {
-		drawLineRaid1d(x, strBeg)
+		drawLineQuadD(x, strBeg)
 	}
 	if y > 2 {
 		for i := 0; i < y-2; i++ {
-			drawLineRaid1d(x, strMed)
+			drawLineQuadD(x, strMed)
 		}
 	}
 	if y > 1 {
-		drawLineRaid1d(x, strEnd)
+		drawLineQuadD(x, strEnd)
 	}
 }
 
@@ -67,7 +67,7 @@ func main() {
 	// Tests all possibilities including 0 0, -x y, x -y
 	for i := 0; i < len(table); i += 2 {
 		if i != len(table)-1 {
-			lib.Challenge("Raid1d", raid1d, student.Raid1d, table[i], table[i+1])
+			lib.Challenge("QuadD", quadD, student.QuadD, table[i], table[i+1])
 		}
 	}
 }
diff --git a/go/tests/func/raid1e_test/main.go b/go/tests/func/quade_test/main.go
similarity index 78%
rename from go/tests/func/raid1e_test/main.go
rename to go/tests/func/quade_test/main.go
index 5c80c3f3..90332f2a 100644
--- a/go/tests/func/raid1e_test/main.go
+++ b/go/tests/func/quade_test/main.go
@@ -8,7 +8,7 @@ import (
 	"lib"
 )
 
-func drawLineRaid1e(x int, s string) {
+func drawLineQuadE(x int, s string) {
 	beg := s[0]
 	med := s[1]
 	end := s[2]
@@ -26,7 +26,7 @@ func drawLineRaid1e(x int, s string) {
 	fmt.Println()
 }
 
-func raid1e(x, y int) {
+func quadE(x, y int) {
 	if x < 1 || y < 1 {
 		return
 	}
@@ -35,15 +35,15 @@ func raid1e(x, y int) {
 	strEnd := "CBA"
 
 	if y >= 1 {
-		drawLineRaid1e(x, strBeg)
+		drawLineQuadE(x, strBeg)
 	}
 	if y > 2 {
 		for i := 0; i < y-2; i++ {
-			drawLineRaid1e(x, strMed)
+			drawLineQuadE(x, strMed)
 		}
 	}
 	if y > 1 {
-		drawLineRaid1e(x, strEnd)
+		drawLineQuadE(x, strEnd)
 	}
 }
 
@@ -67,7 +67,7 @@ func main() {
 	// Tests all possibilities including 0 0, -x y, x -y
 	for i := 0; i < len(table); i += 2 {
 		if i != len(table)-1 {
-			lib.Challenge("Raid1e", raid1e, student.Raid1e, table[i], table[i+1])
+			lib.Challenge("QuadE", quadE, student.QuadE, table[i], table[i+1])
 		}
 	}
 }
diff --git a/go/tests/prog/raid2_prog/main.go b/go/tests/prog/sudoku_prog/main.go
similarity index 100%
rename from go/tests/prog/raid2_prog/main.go
rename to go/tests/prog/sudoku_prog/main.go
diff --git a/go/tests/prog/raid2_test/main.go b/go/tests/prog/sudoku_test/main.go
similarity index 96%
rename from go/tests/prog/raid2_test/main.go
rename to go/tests/prog/sudoku_test/main.go
index cbcde7d6..73686fa4 100644
--- a/go/tests/prog/raid2_test/main.go
+++ b/go/tests/prog/sudoku_test/main.go
@@ -286,13 +286,13 @@ func main() {
 	}
 
 	for _, v := range valid {
-		lib.ChallengeMain("raid2", v...)
+		lib.ChallengeMain("sudoku", v...)
 	}
 
 	for _, v := range invalid {
-		lib.ChallengeMain("raid2", v...)
+		lib.ChallengeMain("sudoku", v...)
 	}
 
-	lib.ChallengeMain("raid2")
-	lib.ChallengeMain("raid2", "not", "a", "sudoku")
+	lib.ChallengeMain("sudoku")
+	lib.ChallengeMain("sudoku", "not", "a", "sudoku")
 }
diff --git a/subjects/raid1/README.md b/subjects/quad/README.md
similarity index 84%
rename from subjects/raid1/README.md
rename to subjects/quad/README.md
index f0e04eb3..3658e078 100644
--- a/subjects/raid1/README.md
+++ b/subjects/quad/README.md
@@ -1,10 +1,10 @@
-# raid1
+# quadrangle
 
-## raid1a
+## quadA
 
 ### Instructions
 
-Write a function `Raid1a` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadA` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -13,7 +13,7 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1a(x,y int) {
+func QuadA(x,y int) {
 
 }
 ```
@@ -30,7 +30,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1a(5,3)
+	piscine.QuadA(5,3)
 }
 ```
 
@@ -53,7 +53,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1a(5,1)
+	piscine.QuadA(5,1)
 }
 ```
 
@@ -74,7 +74,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1a(1,1)
+	piscine.QuadA(1,1)
 }
 ```
 
@@ -95,7 +95,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1a(1,5)
+	piscine.QuadA(1,5)
 }
 ```
 
@@ -114,11 +114,11 @@ student@ubuntu:~/[[ROOT]]/test$
 
 ----
 
-## raid1b
+## quadB
 
 ### Instructions
 
-Write a function `Raid1b` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadB` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -127,7 +127,7 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1b(x,y int) {
+func QuadB(x,y int) {
 
 }
 ```
@@ -144,7 +144,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1b(5,3)
+	piscine.QuadB(5,3)
 }
 ```
 
@@ -167,7 +167,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1b(5,1)
+	piscine.QuadB(5,1)
 }
 ```
 
@@ -188,7 +188,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1b(1,1)
+	piscine.QuadB(1,1)
 }
 ```
 
@@ -209,7 +209,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1b(1,5)
+	piscine.QuadB(1,5)
 }
 ```
 
@@ -228,11 +228,11 @@ student@ubuntu:~/[[ROOT]]/test$
 
 ----
 
-## raid1c
+## quadC
 
 ### Instructions
 
-Write a function `Raid1c` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadC` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -241,7 +241,7 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1c(x,y int) {
+func QuadC(x,y int) {
 
 }
 ```
@@ -258,7 +258,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1c(5,3)
+	piscine.QuadC(5,3)
 }
 ```
 
@@ -281,7 +281,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1c(5,1)
+	piscine.QuadC(5,1)
 }
 ```
 
@@ -302,7 +302,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1c(1,1)
+	piscine.QuadC(1,1)
 }
 ```
 
@@ -323,7 +323,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1c(1,5)
+	piscine.QuadC(1,5)
 }
 ```
 
@@ -342,11 +342,11 @@ student@ubuntu:~/[[ROOT]]/test$
 
 ----
 
-## raid1d
+## quadD
 
 ### Instructions
 
-Write a function `Raid1d` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadD` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -355,7 +355,7 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1d(x,y int) {
+func QuadD(x,y int) {
 
 }
 ```
@@ -372,7 +372,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1d(5,3)
+	piscine.QuadD(5,3)
 }
 ```
 
@@ -395,7 +395,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1d(5,1)
+	piscine.QuadD(5,1)
 }
 ```
 
@@ -416,7 +416,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1d(1,1)
+	piscine.QuadD(1,1)
 }
 ```
 
@@ -437,7 +437,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1d(1,5)
+	piscine.QuadD(1,5)
 }
 ```
 
@@ -456,11 +456,11 @@ student@ubuntu:~/[[ROOT]]/test$
 
 ----
 
-## raid1e
+## quadE
 
 ### Instructions
 
-Write a function `Raid1e` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadE` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -469,7 +469,7 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1e(x,y int) {
+func QuadE(x,y int) {
 
 }
 ```
@@ -486,7 +486,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1e(5,3)
+	piscine.QuadE(5,3)
 }
 ```
 
@@ -509,7 +509,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1e(5,1)
+	piscine.QuadE(5,1)
 }
 ```
 
@@ -530,7 +530,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1e(1,1)
+	piscine.QuadE(1,1)
 }
 ```
 
@@ -551,7 +551,7 @@ package main
 import piscine ".."
 
 func main() {
-	piscine.Raid1e(1,5)
+	piscine.QuadE(1,5)
 }
 ```
 
diff --git a/subjects/raid1/audit/README.md b/subjects/quad/audit/README.md
similarity index 99%
rename from subjects/raid1/audit/README.md
rename to subjects/quad/audit/README.md
index 86718583..0faf4a48 100644
--- a/subjects/raid1/audit/README.md
+++ b/subjects/quad/audit/README.md
@@ -1,4 +1,4 @@
-#### raid1a
+#### quadA
 
 ##### Try running the function with the arguments: `"x=5 and y=3"`
 
@@ -58,7 +58,6 @@ o------------------o
 
 ###### Does the function returns the value above?
 
-
 ##### Try running the function with the arguments: `"x=10 and y=8"`
 
 ```
@@ -74,7 +73,7 @@ o--------o
 
 ###### Does the function returns the value above?
 
-#### raid1b
+#### quadC
 
 ##### Try running the function with the arguments: `"x=5 and y=3"`
 
@@ -94,7 +93,6 @@ o--------o
 
 ###### Does the function returns the value above?
 
-
 ##### Try running the function with the arguments: `"x=1 and y=1"`
 
 ```
@@ -150,7 +148,7 @@ o--------o
 
 ###### Does the function returns the value above?
 
-#### raid1c
+#### quadC
 
 ##### Try running the function with the arguments: `"x=5 and y=3"`
 
@@ -238,7 +236,7 @@ CBBBBBBBBC
 
 ###### Does the function returns the value above?
 
-#### raid1d
+#### quadD
 
 ##### Try running the function with the arguments: `"x=5 and y=3"`
 
@@ -336,7 +334,7 @@ ABBBBBC
 
 ###### Does the function returns the value above?
 
-#### raid1e
+#### quadE
 
 ##### Try running the function with the arguments: `"x=5 and y=3"`
 
diff --git a/subjects/raid1a/README.md b/subjects/quada/README.md
similarity index 84%
rename from subjects/raid1a/README.md
rename to subjects/quada/README.md
index 9a4d0d9e..2a9f3039 100644
--- a/subjects/raid1a/README.md
+++ b/subjects/quada/README.md
@@ -1,8 +1,8 @@
-## raid1a
+## quadrangle
 
 ### Instructions
 
-Write a function `Raid1a` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadA` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -11,7 +11,8 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1a(x,y int) {
+func QuadA(x,y int) {
+
 }
 ```
 
@@ -23,9 +24,11 @@ Program #1
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1a(5,3)
+	piscine.QuadA(5,3)
 }
 ```
 
@@ -44,9 +47,11 @@ Program #2
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1a(5,1)
+	piscine.QuadA(5,1)
 }
 ```
 
@@ -63,9 +68,11 @@ Program #3
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1a(1,1)
+	piscine.QuadA(1,1)
 }
 ```
 
@@ -82,9 +89,11 @@ Program #4
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1a(1,5)
+	piscine.QuadA(1,5)
 }
 ```
 
diff --git a/subjects/raid1b/README.md b/subjects/quadb/README.md
similarity index 84%
rename from subjects/raid1b/README.md
rename to subjects/quadb/README.md
index 497aa2fa..573a61c9 100644
--- a/subjects/raid1b/README.md
+++ b/subjects/quadb/README.md
@@ -1,8 +1,8 @@
-## raid1b
+## quadrangle
 
 ### Instructions
 
-Write a function `Raid1b` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadB` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -11,7 +11,8 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1b(x,y int) {
+func QuadB(x,y int) {
+
 }
 ```
 
@@ -23,9 +24,11 @@ Program #1
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1b(5,3)
+	piscine.QuadB(5,3)
 }
 ```
 
@@ -44,9 +47,11 @@ Program #2
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1b(5,1)
+	piscine.QuadB(5,1)
 }
 ```
 
@@ -63,9 +68,11 @@ Program #3
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1b(1,1)
+	piscine.QuadB(1,1)
 }
 ```
 
@@ -82,9 +89,11 @@ Program #4
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1b(1,5)
+	piscine.QuadB(1,5)
 }
 ```
 
diff --git a/subjects/raid1c/README.md b/subjects/quadc/README.md
similarity index 84%
rename from subjects/raid1c/README.md
rename to subjects/quadc/README.md
index dc4cc3f2..0bdbad69 100644
--- a/subjects/raid1c/README.md
+++ b/subjects/quadc/README.md
@@ -1,8 +1,8 @@
-## raid1c
+## quadrangle
 
 ### Instructions
 
-Write a function `Raid1c` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadC` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -11,7 +11,8 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1c(x,y int) {
+func QuadC(x,y int) {
+
 }
 ```
 
@@ -23,9 +24,11 @@ Program #1
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1c(5,3)
+	piscine.QuadC(5,3)
 }
 ```
 
@@ -44,9 +47,11 @@ Program #2
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1c(5,1)
+	piscine.QuadC(5,1)
 }
 ```
 
@@ -63,9 +68,11 @@ Program #3
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1c(1,1)
+	piscine.QuadC(1,1)
 }
 ```
 
@@ -82,9 +89,11 @@ Program #4
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1c(1,5)
+	piscine.QuadC(1,5)
 }
 ```
 
diff --git a/subjects/raid1d/README.md b/subjects/quadd/README.md
similarity index 84%
rename from subjects/raid1d/README.md
rename to subjects/quadd/README.md
index 8a18b472..8e709ed6 100644
--- a/subjects/raid1d/README.md
+++ b/subjects/quadd/README.md
@@ -1,8 +1,8 @@
-## raid1d
+## quadrangle
 
 ### Instructions
 
-Write a function `Raid1d` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadD` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -11,7 +11,8 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1d(x,y int) {
+func QuadD(x,y int) {
+
 }
 ```
 
@@ -23,9 +24,11 @@ Program #1
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1d(5,3)
+	piscine.QuadD(5,3)
 }
 ```
 
@@ -44,9 +47,11 @@ Program #2
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1d(5,1)
+	piscine.QuadD(5,1)
 }
 ```
 
@@ -63,9 +68,11 @@ Program #3
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1d(1,1)
+	piscine.QuadD(1,1)
 }
 ```
 
@@ -82,9 +89,11 @@ Program #4
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1d(1,5)
+	piscine.QuadD(1,5)
 }
 ```
 
diff --git a/subjects/raid1e/README.md b/subjects/quade/README.md
similarity index 84%
rename from subjects/raid1e/README.md
rename to subjects/quade/README.md
index 62d6ca74..13b380b9 100644
--- a/subjects/raid1e/README.md
+++ b/subjects/quade/README.md
@@ -1,8 +1,8 @@
-## raid1e
+## quadrangle
 
 ### Instructions
 
-Write a function `Raid1e` that prints a **valid** rectangle of width `x` and of height `y`.
+Write a function `QuadE` that prints a **valid** rectangle of width `x` and of height `y`.
 
 The function must draw the rectangles as in the examples.
 
@@ -11,7 +11,8 @@ The function must draw the rectangles as in the examples.
 ### Expected function
 
 ```go
-func Raid1e(x,y int) {
+func QuadE(x,y int) {
+
 }
 ```
 
@@ -23,9 +24,11 @@ Program #1
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1e(5,3)
+	piscine.QuadE(5,3)
 }
 ```
 
@@ -44,9 +47,11 @@ Program #2
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1e(5,1)
+	piscine.QuadE(5,1)
 }
 ```
 
@@ -63,9 +68,11 @@ Program #3
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1e(1,1)
+	piscine.QuadE(1,1)
 }
 ```
 
@@ -82,9 +89,11 @@ Program #4
 
 ```go
 package main
+
 import piscine ".."
+
 func main() {
-	piscine.Raid1e(1,5)
+	piscine.QuadE(1,5)
 }
 ```
 
diff --git a/subjects/quadverifier/README.md b/subjects/quadverifier/README.md
new file mode 100644
index 00000000..77820e2f
--- /dev/null
+++ b/subjects/quadverifier/README.md
@@ -0,0 +1,62 @@
+## quadverifier
+
+### Instructions
+
+This raid is based on the `quad` functions.
+
+Create a program `quadVerifier` that takes a `string` as an argument and displays the name of the matching `quad` and its dimensions.
+
+- If the argument is not a `raid` the program should print `Not a Raid function`.
+
+- All answers must end with a newline (`'\n'`).
+
+- If there is more than one `quad` matches, the program must display them all alphabetically ordered and separated by a `||`.
+
+### Usage
+
+- If it's `quadA`
+
+```console
+student@ubuntu:~/[[ROOT]]/quadverifier$ ls -l
+-rw-r--r-- 1 student student  nov 23 14:30 main.go
+-rwxr-xr-x 1 student student  nov 23 19:18 quadVerifier
+-rwxr-xr-x 1 student student  nov 23 19:50 quadA
+-rwxr-xr-x 1 student student  nov 23 19:50 quadB
+-rwxr-xr-x 1 student student  nov 23 19:50 quadC
+-rwxr-xr-x 1 student student  nov 23 19:50 quadD
+-rwxr-xr-x 1 student student  nov 23 19:50 quadE
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadA 3 3 | ./quadVerifier
+[quadA] [3] [3]
+student@ubuntu:~/[[ROOT]]/quadverifier$
+student@ubuntu:~/[[ROOT]]/quadverifier$
+student@ubuntu:~/[[ROOT]]/quadverifier$
+student@ubuntu:~/[[ROOT]]/quadverifier$
+```
+
+- If it's `quadC 1 1` :
+
+```console
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadC 1 1
+A
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadD 1 1
+A
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadE 1 1
+A
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadC 1 1 | ./quadVerifier
+[quadC] [1] [1] || [quadD] [1] [1] || [quadE] [1] [1]
+student@ubuntu:~/[[ROOT]]/quadverifier$
+```
+
+- If it's `quadC 1 2` :
+
+```console
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadE 1 2
+A
+C
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadC 1 2
+A
+C
+student@ubuntu:~/[[ROOT]]/quadverifier$ ./quadE 1 2 | ./quadVerifier
+[quadC] [1] [2] || [quadE] [1] [2]
+student@ubuntu:~/[[ROOT]]/quadverifier$
+```
diff --git a/subjects/quadverifier/audit/README.md b/subjects/quadverifier/audit/README.md
new file mode 100644
index 00000000..fb555dc9
--- /dev/null
+++ b/subjects/quadverifier/audit/README.md
@@ -0,0 +1,73 @@
+#### Quadrangle verifier
+
+##### Try running the program: `"./quadA 3 3 | ./quadVerifier"`
+
+```
+[quadA] [3] [3]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadB 3 3 | ./quadVerifier"`
+
+```
+[quadB] [3] [3]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadC 1 1 | ./quadVerifier"`
+
+```
+[quadC] [1] [1] || [quadD] [1] [1] || [quadE] [1] [1]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadE 1 2 | ./quadVerifier"`
+
+```
+[quadC] [1] [2] || [quadE] [1] [2]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadE 2 1 | ./quadVerifier"`
+
+```
+[quadD] [2] [1] || [quadE] [2] [1]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadC 2 1 | ./quadVerifier"`
+
+```
+[quadC] [2] [1]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadD 1 2 | ./quadVerifier"`
+
+```
+[quadD] [1] [2]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"./quadE 1 1 | ./quadVerifier"`
+
+```
+[quadC] [1] [1] || [quadD] [1] [1] || [quadE] [1] [1]
+```
+
+###### Does the program returns the value above?
+
+##### Try running the program: `"echo 0 0 | ./quadVerifier"`
+
+```
+Not a Raid function
+```
+
+###### Does the program returns the value above?
diff --git a/subjects/raid2/README.md b/subjects/raid2/README.md
deleted file mode 100644
index e22f7752..00000000
--- a/subjects/raid2/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-## raid2
-
-### Instructions
-
-- Create a program that resolves a sudoku.
-
-- A valid sudoku has only one possible solution.
-
-### Usage
-
-#### Example 1:
-
-Example of output for one valid sudoku :
-
-```console
-student@ubuntu:~/[[ROOT]]/raid2$ go build
-student@ubuntu:~/[[ROOT]]/raid2$ ./raid2 ".96.4...1" "1...6...4" "5.481.39." "..795..43" ".3..8...." "4.5.23.18" ".1.63..59" ".59.7.83." "..359...7" | cat -e
-3 9 6 2 4 5 7 8 1$
-1 7 8 3 6 9 5 2 4$
-5 2 4 8 1 7 3 9 6$
-2 8 7 9 5 1 6 4 3$
-9 3 1 4 8 6 2 7 5$
-4 6 5 7 2 3 9 1 8$
-7 1 2 6 3 8 4 5 9$
-6 5 9 1 7 4 8 3 2$
-8 4 3 5 9 2 1 6 7$
-student@ubuntu:~/[[ROOT]]/raid2$
-```
-
-#### Example 2:
-
-Examples of output for invalid input or sudokus :
-
-```console
-student@ubuntu:~/[[ROOT]]/raid2$ ./raid2 1 2 3 4 | cat -e
-Error$
-student@ubuntu:~/[[ROOT]]/raid2$ ./raid2 | cat -e
-Error$
-student@ubuntu:~/[[ROOT]]/raid2$ ./raid2 ".96.4...1" "1...6.1.4" "5.481.39." "..795..43" ".3..8...." "4.5.23.18" ".1.63..59" ".59.7.83." "..359...7" | cat -e
-Error$
-student@ubuntu:~/[[ROOT]]/raid2$
-```
diff --git a/subjects/raid3/README.md b/subjects/raid3/README.md
deleted file mode 100644
index a2eea0cc..00000000
--- a/subjects/raid3/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-## raid3
-
-### Instructions
-
-This raid is based on the `raid1` functions.
-
-Create a program `raid3` that takes a `string` as an argument and displays the name of the matching `raid1` and its dimensions.
-
-- If the argument is not a `raid1` the program should print `Not a Raid function`.
-
-- All answers must end with a newline (`'\n'`).
-
-- If there is more than one `raid1` matches, the program must display them all alphabetically ordered and separated by a `||`.
-
-### Usage
-
-- If it's `raid1a`
-
-```console
-student@ubuntu:~/[[ROOT]]/raid3$ ls -l
--rw-r--r-- 1 student student  nov 23 14:30 main.go
--rwxr-xr-x 1 student student  nov 23 19:18 raid3
--rwxr-xr-x 1 student student  nov 23 19:50 raid1a
--rwxr-xr-x 1 student student  nov 23 19:50 raid1b
--rwxr-xr-x 1 student student  nov 23 19:50 raid1c
--rwxr-xr-x 1 student student  nov 23 19:50 raid1d
--rwxr-xr-x 1 student student  nov 23 19:50 raid1e
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1a 3 3 | ./raid3
-[raid1a] [3] [3]
-student@ubuntu:~/[[ROOT]]/raid3$
-student@ubuntu:~/[[ROOT]]/raid3$
-student@ubuntu:~/[[ROOT]]/raid3$
-student@ubuntu:~/[[ROOT]]/raid3$
-```
-
-- If it's `raidc 1 1` :
-
-```console
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1c 1 1
-A
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1d 1 1
-A
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1e 1 1
-A
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1c 1 1 | ./raid3
-[raid1c] [1] [1] || [raid1d] [1] [1] || [raid1e] [1] [1]
-student@ubuntu:~/[[ROOT]]/raid3$
-```
-
-- If it's `raidc 1 2` :
-
-```console
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1e 1 2
-A
-C
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1c 1 2
-A
-C
-student@ubuntu:~/[[ROOT]]/raid3$ ./raid1e 1 2 | ./raid3
-[raid1c] [1] [2] || [raid1e] [1] [2]
-student@ubuntu:~/[[ROOT]]/raid3$
-```
diff --git a/subjects/raid3/audit/README.md b/subjects/raid3/audit/README.md
deleted file mode 100644
index 97f6a953..00000000
--- a/subjects/raid3/audit/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-#### Raid 3
-
-##### Try running the program: `"./raid1a 3 3 | ./raid3"`
-
-```
-[raid1a] [3] [3]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1b 3 3 | ./raid3"`
-
-```
-[raid1b] [3] [3]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1c 1 1 | ./raid3"`
-
-```
-[raid1c] [1] [1] || [raid1d] [1] [1] || [raid1e] [1] [1]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1e 1 2 | ./raid3"`
-
-```
-[raid1c] [1] [2] || [raid1e] [1] [2]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1e 2 1 | ./raid3"`
-
-```
-[raid1d] [2] [1] || [raid1e] [2] [1]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1c 2 1 | ./raid3"`
-
-```
-[raid1c] [2] [1]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1d 1 2 | ./raid3"`
-
-```
-[raid1d] [1] [2]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"./raid1e 1 1 | ./raid3"`
-
-```
-[raid1c] [1] [1] || [raid1d] [1] [1] || [raid1e] [1] [1]
-```
-
-###### Does the program returns the value above?
-
-##### Try running the program: `"echo 0 0 | ./raid3"`
-
-```
-Not a Raid function
-```
-
-###### Does the program returns the value above?
diff --git a/subjects/sudoku/README.md b/subjects/sudoku/README.md
new file mode 100644
index 00000000..d263c494
--- /dev/null
+++ b/subjects/sudoku/README.md
@@ -0,0 +1,42 @@
+## sudoku
+
+### Instructions
+
+- Create a program that resolves a sudoku.
+
+- A valid sudoku has only one possible solution.
+
+### Usage
+
+#### Example 1:
+
+Example of output for one valid sudoku :
+
+```console
+student@ubuntu:~/[[ROOT]]/sudoku$ go build
+student@ubuntu:~/[[ROOT]]/sudoku$ ./sudoku ".96.4...1" "1...6...4" "5.481.39." "..795..43" ".3..8...." "4.5.23.18" ".1.63..59" ".59.7.83." "..359...7" | cat -e
+3 9 6 2 4 5 7 8 1$
+1 7 8 3 6 9 5 2 4$
+5 2 4 8 1 7 3 9 6$
+2 8 7 9 5 1 6 4 3$
+9 3 1 4 8 6 2 7 5$
+4 6 5 7 2 3 9 1 8$
+7 1 2 6 3 8 4 5 9$
+6 5 9 1 7 4 8 3 2$
+8 4 3 5 9 2 1 6 7$
+student@ubuntu:~/[[ROOT]]/sudoku$
+```
+
+#### Example 2:
+
+Examples of output for invalid input or sudokus :
+
+```console
+student@ubuntu:~/[[ROOT]]/sudoku$ ./sudoku 1 2 3 4 | cat -e
+Error$
+student@ubuntu:~/[[ROOT]]/sudoku$ ./sudoku | cat -e
+Error$
+student@ubuntu:~/[[ROOT]]/sudoku$ ./sudoku ".96.4...1" "1...6.1.4" "5.481.39." "..795..43" ".3..8...." "4.5.23.18" ".1.63..59" ".59.7.83." "..359...7" | cat -e
+Error$
+student@ubuntu:~/[[ROOT]]/sudoku$
+```
diff --git a/subjects/raid2/audit/README.md b/subjects/sudoku/audit/README.md
similarity index 99%
rename from subjects/raid2/audit/README.md
rename to subjects/sudoku/audit/README.md
index c8dff73e..5e7f42ba 100644
--- a/subjects/raid2/audit/README.md
+++ b/subjects/sudoku/audit/README.md
@@ -1,4 +1,4 @@
-#### Raid 2
+#### Sudoku
 
 ##### Try running the program with the arguments: `"".96.4...1" "1...6...4" "5.481.39." "..795..43" ".3..8...." "4.5.23.18" ".1.63..59" ".59.7.83." "..359...7""`