diff --git a/89_Tic-Tac-Toe/java/src/TicTacToe2.java b/89_Tic-Tac-Toe/java/src/TicTacToe.java
similarity index 99%
rename from 89_Tic-Tac-Toe/java/src/TicTacToe2.java
rename to 89_Tic-Tac-Toe/java/src/TicTacToe.java
index bda3793c..c8fa2d03 100644
--- a/89_Tic-Tac-Toe/java/src/TicTacToe2.java
+++ b/89_Tic-Tac-Toe/java/src/TicTacToe.java
@@ -4,7 +4,7 @@ import java.util.Random;
 /**
  * @author Ollie Hensman-Crook
  */
-public class TicTacToe2 {
+public class TicTacToe {
     public static void main(String[] args) {
         Board gameBoard = new Board();
         Random compChoice = new Random();
diff --git a/89_Tic-Tac-Toe/kotlin/TicTacToe2.kt b/89_Tic-Tac-Toe/kotlin/TicTacToe.kt
similarity index 100%
rename from 89_Tic-Tac-Toe/kotlin/TicTacToe2.kt
rename to 89_Tic-Tac-Toe/kotlin/TicTacToe.kt
diff --git a/buildJvm/build.gradle.kts b/buildJvm/build.gradle.kts
index d4dcecd3..d953049e 100644
--- a/buildJvm/build.gradle.kts
+++ b/buildJvm/build.gradle.kts
@@ -19,63 +19,29 @@ java {
     }
 }
 
-task("copyScripts", Copy::class) {
+task("distributeBin", Copy::class) {
     from(filesType("bin"))
-    into("/tmp/bin7/bin")
+    into("$buildDir/distrib/bin")
     duplicatesStrategy = DuplicatesStrategy.WARN
-    mustRunAfter(":installDist")
+    dependsOn(":build_94_War_kotlin:installDist")
 }
 
-task("copyLibs", Copy::class) {
+task("distributeLib", Copy::class) {
     from(filesType("lib"))
-    into("/tmp/bin7/lib")
+    into("$buildDir/distrib/lib")
     duplicatesStrategy = DuplicatesStrategy.WARN
-    mustRunAfter(":installDist")
+    dependsOn("installDist")
 }
 
-task ("copyAll") {
+task("copyAll") {
     dependsOn(
-        ":assemble",
-        ":installDist",
-        ":copyScripts",
-        ":copyLibs"
+        ":distributeBin",
+        ":distributeLib"
     )
 }
 
-//
-//java {
-//    toolchain {
-//        languageVersion = JavaLanguageVersion.of(17)
-//    }
-//}
-//
-//dependencies {
-//    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.0'
-//}
-//
-//task buildAll {
-//    doLast {
-//        def bins = fileTree(dir: "$buildDir/..").getFiles()
-//        println bins
-//    }
-//}
-//tasks.register('fullBuild', Copy) {
-////    from fileTree(dir: "$buildDir/../").getFiles()
-////    into file("/tmp/bin6")
-////    duplicatesStrategy = DuplicatesStrategy.WARN
-//    doLast {
-//        println (fileTree(dir: "$buildDir/../").getFiles())
-//    }
-////    def i=0
-////    eachFile {
-////        details ->
-////            details.setPath( "bbb${i}")
-////            i++
-////            duplicatesStrategy = DuplicatesStrategy.WARN
-////    }
-//}
-
-fun Build_gradle.filesType(type: String) = fileTree("$buildDir/..").files.filter {
-    it.path.contains("build/install/build_.*/$type".toRegex())
-            && it.isFile
-}
\ No newline at end of file
+fun filesType(type: String) =
+    fileTree("$buildDir/..").files.filter {
+        it.path.contains("build/install/build_.*/$type".toRegex())
+                && it.isFile
+    }
\ No newline at end of file
diff --git a/buildJvm/build_02_Amazing_java/gradle.properties b/buildJvm/build_02_Amazing_java/gradle.properties
index 86aaedc0..aa5f3f7b 100644
--- a/buildJvm/build_02_Amazing_java/gradle.properties
+++ b/buildJvm/build_02_Amazing_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=02_Amazing/java
-gameMain=Amazing
+gameMain=AmazingGame
diff --git a/buildJvm/build_15_Boxing_java/gradle.properties b/buildJvm/build_15_Boxing_java/gradle.properties
index 8153f3c4..2c8ca8fc 100644
--- a/buildJvm/build_15_Boxing_java/gradle.properties
+++ b/buildJvm/build_15_Boxing_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=15_Boxing/java
-gameMain=Boxing
+gameMain=BoxingGame
diff --git a/buildJvm/build_16_Bug_java/gradle.properties b/buildJvm/build_16_Bug_java/gradle.properties
index ca50b396..215d60ef 100644
--- a/buildJvm/build_16_Bug_java/gradle.properties
+++ b/buildJvm/build_16_Bug_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=16_Bug/java/src
-gameMain=Bug
+gameMain=BugGame
diff --git a/buildJvm/build_18_Bullseye_java/gradle.properties b/buildJvm/build_18_Bullseye_java/gradle.properties
index 56d72d5d..912db9b6 100644
--- a/buildJvm/build_18_Bullseye_java/gradle.properties
+++ b/buildJvm/build_18_Bullseye_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=18_Bullseye/java/src
-gameMain=Bullseye
+gameMain=BullseyeGame
diff --git a/buildJvm/build_22_Change_java/gradle.properties b/buildJvm/build_22_Change_java/gradle.properties
index 10b64bca..737243ae 100644
--- a/buildJvm/build_22_Change_java/gradle.properties
+++ b/buildJvm/build_22_Change_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=22_Change/java/src
-gameMain=Change
+gameMain=ChangeGame
diff --git a/buildJvm/build_24_Chemist_java/gradle.properties b/buildJvm/build_24_Chemist_java/gradle.properties
index 40e3116d..84362ea3 100644
--- a/buildJvm/build_24_Chemist_java/gradle.properties
+++ b/buildJvm/build_24_Chemist_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=24_Chemist/java/src
-gameMain=Chemist
+gameMain=ChemistGame
\ No newline at end of file
diff --git a/buildJvm/build_25_Chief_java/gradle.properties b/buildJvm/build_25_Chief_java/gradle.properties
index cd4d2738..af8dd77a 100644
--- a/buildJvm/build_25_Chief_java/gradle.properties
+++ b/buildJvm/build_25_Chief_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=25_Chief/java/src
-gameMain=Chief
+gameMain=ChiefGame
\ No newline at end of file
diff --git a/buildJvm/build_31_Depth_Charge_java/gradle.properties b/buildJvm/build_31_Depth_Charge_java/gradle.properties
index 4ab0c057..239dfcb7 100644
--- a/buildJvm/build_31_Depth_Charge_java/gradle.properties
+++ b/buildJvm/build_31_Depth_Charge_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=31_Depth_Charge/java
-gameMain=Depth_Charge
+gameMain=DepthCharge
diff --git a/buildJvm/build_33_Dice_java/gradle.properties b/buildJvm/build_33_Dice_java/gradle.properties
index 964230ed..a04a70cf 100644
--- a/buildJvm/build_33_Dice_java/gradle.properties
+++ b/buildJvm/build_33_Dice_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=33_Dice/java/src
-gameMain=Dice
+gameMain=DiceGame
\ No newline at end of file
diff --git a/buildJvm/build_36_Flip_Flop_java/gradle.properties b/buildJvm/build_36_Flip_Flop_java/gradle.properties
index ea01082c..d60259c1 100644
--- a/buildJvm/build_36_Flip_Flop_java/gradle.properties
+++ b/buildJvm/build_36_Flip_Flop_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=36_Flip_Flop/java
-gameMain=Flip_Flop
+gameMain=FlipFlop
diff --git a/buildJvm/build_38_Fur_Trader_java/gradle.properties b/buildJvm/build_38_Fur_Trader_java/gradle.properties
index b9b6e2dc..13eafeb4 100644
--- a/buildJvm/build_38_Fur_Trader_java/gradle.properties
+++ b/buildJvm/build_38_Fur_Trader_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=38_Fur_Trader/java/src
-gameMain=Fur_Trader
+gameMain=FurTraderGame
\ No newline at end of file
diff --git a/buildJvm/build_41_Guess_java/gradle.properties b/buildJvm/build_41_Guess_java/gradle.properties
index 91625be7..f03bfad1 100644
--- a/buildJvm/build_41_Guess_java/gradle.properties
+++ b/buildJvm/build_41_Guess_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=41_Guess/java/src
-gameMain=Guess
+gameMain=GuessGame
\ No newline at end of file
diff --git a/buildJvm/build_43_Hammurabi_java/gradle.properties b/buildJvm/build_43_Hammurabi_java/gradle.properties
index c200743f..3374d23e 100644
--- a/buildJvm/build_43_Hammurabi_java/gradle.properties
+++ b/buildJvm/build_43_Hammurabi_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=43_Hammurabi/java/src
-gameMain=Hammurabi
+gameMain=HamurabiGame
diff --git a/buildJvm/build_47_Hi-Lo_java/gradle.properties b/buildJvm/build_47_Hi-Lo_java/gradle.properties
index f15b9dfa..5ee2a237 100644
--- a/buildJvm/build_47_Hi-Lo_java/gradle.properties
+++ b/buildJvm/build_47_Hi-Lo_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=47_Hi-Lo/java/src
-gameMain=Hi-Lo
+gameMain=HiLoGame
\ No newline at end of file
diff --git a/buildJvm/build_51_Hurkle_java/gradle.properties b/buildJvm/build_51_Hurkle_java/gradle.properties
index 3d505a47..508804ff 100644
--- a/buildJvm/build_51_Hurkle_java/gradle.properties
+++ b/buildJvm/build_51_Hurkle_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=51_Hurkle/java/src
-gameMain=Hurkle
+gameMain=HurkleGame
\ No newline at end of file
diff --git a/buildJvm/build_52_Kinema_java/gradle.properties b/buildJvm/build_52_Kinema_java/gradle.properties
index 2a768252..8ab182cf 100644
--- a/buildJvm/build_52_Kinema_java/gradle.properties
+++ b/buildJvm/build_52_Kinema_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=52_Kinema/java/src
-gameMain=Kinema
+gameMain=KinemaGame
\ No newline at end of file
diff --git a/buildJvm/build_54_Letter_java/gradle.properties b/buildJvm/build_54_Letter_java/gradle.properties
index b857a56f..bda98ac6 100644
--- a/buildJvm/build_54_Letter_java/gradle.properties
+++ b/buildJvm/build_54_Letter_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=54_Letter/java/src
-gameMain=Letter
+gameMain=LetterGame
\ No newline at end of file
diff --git a/buildJvm/build_57_Literature_Quiz_java/gradle.properties b/buildJvm/build_57_Literature_Quiz_java/gradle.properties
index 83611248..0102ba46 100644
--- a/buildJvm/build_57_Literature_Quiz_java/gradle.properties
+++ b/buildJvm/build_57_Literature_Quiz_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=57_Literature_Quiz/java/src
-gameMain=Literature_Quiz
+gameMain=LiteratureQuizGame
diff --git a/buildJvm/build_61_Math_Dice_java/gradle.properties b/buildJvm/build_61_Math_Dice_java/gradle.properties
index 30b64aac..0439407b 100644
--- a/buildJvm/build_61_Math_Dice_java/gradle.properties
+++ b/buildJvm/build_61_Math_Dice_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=61_Math_Dice/java
-gameMain=Math_Dice
+gameMain=MathDice
\ No newline at end of file
diff --git a/buildJvm/build_67_One_Check_java/gradle.properties b/buildJvm/build_67_One_Check_java/gradle.properties
index 24fe012f..995bd254 100644
--- a/buildJvm/build_67_One_Check_java/gradle.properties
+++ b/buildJvm/build_67_One_Check_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=67_One_Check/java
-gameMain=One_Check
+gameMain=OneCheck
diff --git a/buildJvm/build_69_Pizza_java/gradle.properties b/buildJvm/build_69_Pizza_java/gradle.properties
index a03890a0..959746a6 100644
--- a/buildJvm/build_69_Pizza_java/gradle.properties
+++ b/buildJvm/build_69_Pizza_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=69_Pizza/java/src
-gameMain=Pizza
+gameMain=PizzaGame
diff --git a/buildJvm/build_74_Rock_Scissors_Paper_java/gradle.properties b/buildJvm/build_74_Rock_Scissors_Paper_java/gradle.properties
index fdf0aeab..1cdf93a7 100644
--- a/buildJvm/build_74_Rock_Scissors_Paper_java/gradle.properties
+++ b/buildJvm/build_74_Rock_Scissors_Paper_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=74_Rock_Scissors_Paper/java/src
-gameMain=Rock_Scissors_Paper
+gameMain=RockScissors
diff --git a/buildJvm/build_76_Russian_Roulette_java/gradle.properties b/buildJvm/build_76_Russian_Roulette_java/gradle.properties
index bad15790..89078da0 100644
--- a/buildJvm/build_76_Russian_Roulette_java/gradle.properties
+++ b/buildJvm/build_76_Russian_Roulette_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=76_Russian_Roulette/java/src
-gameMain=Russian_Roulette
+gameMain=RussianRoulette
diff --git a/buildJvm/build_78_Sine_Wave_java/gradle.properties b/buildJvm/build_78_Sine_Wave_java/gradle.properties
index 696dad10..c5adb119 100644
--- a/buildJvm/build_78_Sine_Wave_java/gradle.properties
+++ b/buildJvm/build_78_Sine_Wave_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=78_Sine_Wave/java/src
-gameMain=Sine_Wave
+gameMain=SineWave
diff --git a/buildJvm/build_80_Slots_java/gradle.properties b/buildJvm/build_80_Slots_java/gradle.properties
index 01117332..f4930f1e 100644
--- a/buildJvm/build_80_Slots_java/gradle.properties
+++ b/buildJvm/build_80_Slots_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=80_Slots/java/src
-gameMain=Slots
+gameMain=SlotsGame
diff --git a/buildJvm/build_82_Stars_java/gradle.properties b/buildJvm/build_82_Stars_java/gradle.properties
index 9f135fe4..5f2e51f6 100644
--- a/buildJvm/build_82_Stars_java/gradle.properties
+++ b/buildJvm/build_82_Stars_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=82_Stars/java/src
-gameMain=Stars
+gameMain=StarsGame
diff --git a/buildJvm/build_85_Synonym_java/gradle.properties b/buildJvm/build_85_Synonym_java/gradle.properties
index 69d9a631..448430db 100644
--- a/buildJvm/build_85_Synonym_java/gradle.properties
+++ b/buildJvm/build_85_Synonym_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=85_Synonym/java/src
-gameMain=Synonym
+gameMain=SynonymGame
diff --git a/buildJvm/build_87_3-D_Plot_java/gradle.properties b/buildJvm/build_87_3-D_Plot_java/gradle.properties
index 1f852884..fb6ce1a9 100644
--- a/buildJvm/build_87_3-D_Plot_java/gradle.properties
+++ b/buildJvm/build_87_3-D_Plot_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=87_3-D_Plot/java
-gameMain=3-D_Plot
+gameMain=Plot3D
diff --git a/buildJvm/build_89_Tic-Tac-Toe_java/gradle.properties b/buildJvm/build_89_Tic-Tac-Toe_java/gradle.properties
index 737f66ad..a12fceda 100644
--- a/buildJvm/build_89_Tic-Tac-Toe_java/gradle.properties
+++ b/buildJvm/build_89_Tic-Tac-Toe_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=89_Tic-Tac-Toe/java/src
-gameMain=Tic-Tac-Toe
+gameMain=TicTacToe
diff --git a/buildJvm/build_89_Tic-Tac-Toe_kotlin/gradle.properties b/buildJvm/build_89_Tic-Tac-Toe_kotlin/gradle.properties
index b13318b6..8bb1e169 100644
--- a/buildJvm/build_89_Tic-Tac-Toe_kotlin/gradle.properties
+++ b/buildJvm/build_89_Tic-Tac-Toe_kotlin/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=89_Tic-Tac-Toe/kotlin
-gameMain=BoardKt
+gameMain=TicTacToeKt
diff --git a/buildJvm/build_92_Trap_java/gradle.properties b/buildJvm/build_92_Trap_java/gradle.properties
index df6406e5..a01ba4ea 100644
--- a/buildJvm/build_92_Trap_java/gradle.properties
+++ b/buildJvm/build_92_Trap_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=92_Trap/java/src
-gameMain=Trap
+gameMain=TrapGame
\ No newline at end of file
diff --git a/buildJvm/build_93_23_Matches_java/gradle.properties b/buildJvm/build_93_23_Matches_java/gradle.properties
index 85082017..c1b1c269 100644
--- a/buildJvm/build_93_23_Matches_java/gradle.properties
+++ b/buildJvm/build_93_23_Matches_java/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=93_23_Matches/java
-gameMain=Matches
+gameMain=TwentyThreeMatchesGame
\ No newline at end of file
diff --git a/buildJvm/build_94_War_kotlin/gradle.properties b/buildJvm/build_94_War_kotlin/gradle.properties
index a63a5f7d..e9fdd4bc 100644
--- a/buildJvm/build_94_War_kotlin/gradle.properties
+++ b/buildJvm/build_94_War_kotlin/gradle.properties
@@ -1,2 +1,2 @@
 gameSource=94_War/kotlin
-gameMain=WarKr
+gameMain=WarKt