diff --git a/debian/_base/core/tdegames/debian/icons/kwin4-16.xpm b/debian/_base/core/tdegames/debian/icons/twin4-16.xpm
similarity index 100%
rename from debian/_base/core/tdegames/debian/icons/kwin4-16.xpm
rename to debian/_base/core/tdegames/debian/icons/twin4-16.xpm
diff --git a/debian/_base/core/tdegames/debian/icons/kwin4.xpm b/debian/_base/core/tdegames/debian/icons/twin4.xpm
similarity index 100%
rename from debian/_base/core/tdegames/debian/icons/kwin4.xpm
rename to debian/_base/core/tdegames/debian/icons/twin4.xpm
diff --git a/dilos/core/tdegames/debian/man/kwin4-trinity.man b/debian/_base/core/tdegames/debian/man/twin4-trinity.man
similarity index 98%
rename from dilos/core/tdegames/debian/man/kwin4-trinity.man
rename to debian/_base/core/tdegames/debian/man/twin4-trinity.man
index 629ab3407..d2c558fb8 100644
--- a/dilos/core/tdegames/debian/man/kwin4-trinity.man
+++ b/debian/_base/core/tdegames/debian/man/twin4-trinity.man
@@ -1,4 +1,4 @@
-.TH KWIN4 6
+.TH TWIN4 6
 .SH NAME
 twin4 \- Connect Four clone for TDE
 .SH SYNOPSIS
diff --git a/dilos/core/tdegames/debian/man/kwin4proc-trinity.man b/debian/_base/core/tdegames/debian/man/twin4proc-trinity.man
similarity index 91%
rename from dilos/core/tdegames/debian/man/kwin4proc-trinity.man
rename to debian/_base/core/tdegames/debian/man/twin4proc-trinity.man
index 5b1856418..0d13a326a 100644
--- a/dilos/core/tdegames/debian/man/kwin4proc-trinity.man
+++ b/debian/_base/core/tdegames/debian/man/twin4proc-trinity.man
@@ -1,4 +1,4 @@
-.TH KWIN4PROC 6
+.TH TWIN4PROC 6
 .SH NAME
 twin4proc \- AI backend for twin4
 .SH DESCRIPTION
diff --git a/debian/_base/core/tdegames/debian/kwin4-trinity.install b/debian/_base/core/tdegames/debian/twin4-trinity.install
similarity index 100%
rename from debian/_base/core/tdegames/debian/kwin4-trinity.install
rename to debian/_base/core/tdegames/debian/twin4-trinity.install
diff --git a/debian/_base/core/tdegames/debian/kwin4-trinity.links b/debian/_base/core/tdegames/debian/twin4-trinity.links
similarity index 100%
rename from debian/_base/core/tdegames/debian/kwin4-trinity.links
rename to debian/_base/core/tdegames/debian/twin4-trinity.links
diff --git a/debian/_base/core/tdegames/debian/kwin4-trinity.manpages b/debian/_base/core/tdegames/debian/twin4-trinity.manpages
similarity index 100%
rename from debian/_base/core/tdegames/debian/kwin4-trinity.manpages
rename to debian/_base/core/tdegames/debian/twin4-trinity.manpages
diff --git a/debian/_base/core/tdegames/debian/kwin4-trinity.menu b/debian/_base/core/tdegames/debian/twin4-trinity.menu
similarity index 92%
rename from debian/_base/core/tdegames/debian/kwin4-trinity.menu
rename to debian/_base/core/tdegames/debian/twin4-trinity.menu
index 51f43cb8e..b0ac672f5 100644
--- a/debian/_base/core/tdegames/debian/kwin4-trinity.menu
+++ b/debian/_base/core/tdegames/debian/twin4-trinity.menu
@@ -2,8 +2,7 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KWin4"\
+	title="TWin4"\
 	icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
 	command="/opt/trinity/games/twin4"
-
diff --git a/dilos/core/tdegames/debian/icons/kwin4-16.xpm b/dilos/core/tdegames/debian/icons/twin4-16.xpm
similarity index 100%
rename from dilos/core/tdegames/debian/icons/kwin4-16.xpm
rename to dilos/core/tdegames/debian/icons/twin4-16.xpm
diff --git a/dilos/core/tdegames/debian/icons/kwin4.xpm b/dilos/core/tdegames/debian/icons/twin4.xpm
similarity index 100%
rename from dilos/core/tdegames/debian/icons/kwin4.xpm
rename to dilos/core/tdegames/debian/icons/twin4.xpm
diff --git a/debian/_base/core/tdegames/debian/man/kwin4-trinity.man b/dilos/core/tdegames/debian/man/twin4-trinity.man
similarity index 98%
rename from debian/_base/core/tdegames/debian/man/kwin4-trinity.man
rename to dilos/core/tdegames/debian/man/twin4-trinity.man
index 629ab3407..d2c558fb8 100644
--- a/debian/_base/core/tdegames/debian/man/kwin4-trinity.man
+++ b/dilos/core/tdegames/debian/man/twin4-trinity.man
@@ -1,4 +1,4 @@
-.TH KWIN4 6
+.TH TWIN4 6
 .SH NAME
 twin4 \- Connect Four clone for TDE
 .SH SYNOPSIS
diff --git a/ubuntu/_base/core/tdegames/debian/man/kwin4proc-trinity.man b/dilos/core/tdegames/debian/man/twin4proc-trinity.man
similarity index 91%
rename from ubuntu/_base/core/tdegames/debian/man/kwin4proc-trinity.man
rename to dilos/core/tdegames/debian/man/twin4proc-trinity.man
index 5b1856418..0d13a326a 100644
--- a/ubuntu/_base/core/tdegames/debian/man/kwin4proc-trinity.man
+++ b/dilos/core/tdegames/debian/man/twin4proc-trinity.man
@@ -1,4 +1,4 @@
-.TH KWIN4PROC 6
+.TH TWIN4PROC 6
 .SH NAME
 twin4proc \- AI backend for twin4
 .SH DESCRIPTION
diff --git a/dilos/core/tdegames/debian/kwin4-trinity.install b/dilos/core/tdegames/debian/twin4-trinity.install
similarity index 100%
rename from dilos/core/tdegames/debian/kwin4-trinity.install
rename to dilos/core/tdegames/debian/twin4-trinity.install
diff --git a/dilos/core/tdegames/debian/kwin4-trinity.links b/dilos/core/tdegames/debian/twin4-trinity.links
similarity index 100%
rename from dilos/core/tdegames/debian/kwin4-trinity.links
rename to dilos/core/tdegames/debian/twin4-trinity.links
diff --git a/dilos/core/tdegames/debian/kwin4-trinity.manpages b/dilos/core/tdegames/debian/twin4-trinity.manpages
similarity index 100%
rename from dilos/core/tdegames/debian/kwin4-trinity.manpages
rename to dilos/core/tdegames/debian/twin4-trinity.manpages
diff --git a/dilos/core/tdegames/debian/kwin4-trinity.menu b/dilos/core/tdegames/debian/twin4-trinity.menu
similarity index 91%
rename from dilos/core/tdegames/debian/kwin4-trinity.menu
rename to dilos/core/tdegames/debian/twin4-trinity.menu
index 7564ce0ad..1a737ad84 100644
--- a/dilos/core/tdegames/debian/kwin4-trinity.menu
+++ b/dilos/core/tdegames/debian/twin4-trinity.menu
@@ -2,8 +2,7 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KWin4"\
+	title="TWin4"\
 	icon32x32="/usr/share/pixmaps/twin4.xpm"\
 	icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
 	command="/usr/games/twin4"
-
diff --git a/ubuntu/_base/core/tdegames/debian/icons/kwin4-16.xpm b/ubuntu/_base/core/tdegames/debian/icons/twin4-16.xpm
similarity index 100%
rename from ubuntu/_base/core/tdegames/debian/icons/kwin4-16.xpm
rename to ubuntu/_base/core/tdegames/debian/icons/twin4-16.xpm
diff --git a/ubuntu/_base/core/tdegames/debian/icons/kwin4.xpm b/ubuntu/_base/core/tdegames/debian/icons/twin4.xpm
similarity index 100%
rename from ubuntu/_base/core/tdegames/debian/icons/kwin4.xpm
rename to ubuntu/_base/core/tdegames/debian/icons/twin4.xpm
diff --git a/ubuntu/_base/core/tdegames/debian/man/kwin4-trinity.man b/ubuntu/_base/core/tdegames/debian/man/twin4-trinity.man
similarity index 98%
rename from ubuntu/_base/core/tdegames/debian/man/kwin4-trinity.man
rename to ubuntu/_base/core/tdegames/debian/man/twin4-trinity.man
index 629ab3407..d2c558fb8 100644
--- a/ubuntu/_base/core/tdegames/debian/man/kwin4-trinity.man
+++ b/ubuntu/_base/core/tdegames/debian/man/twin4-trinity.man
@@ -1,4 +1,4 @@
-.TH KWIN4 6
+.TH TWIN4 6
 .SH NAME
 twin4 \- Connect Four clone for TDE
 .SH SYNOPSIS
diff --git a/debian/_base/core/tdegames/debian/man/kwin4proc-trinity.man b/ubuntu/_base/core/tdegames/debian/man/twin4proc-trinity.man
similarity index 91%
rename from debian/_base/core/tdegames/debian/man/kwin4proc-trinity.man
rename to ubuntu/_base/core/tdegames/debian/man/twin4proc-trinity.man
index 5b1856418..0d13a326a 100644
--- a/debian/_base/core/tdegames/debian/man/kwin4proc-trinity.man
+++ b/ubuntu/_base/core/tdegames/debian/man/twin4proc-trinity.man
@@ -1,4 +1,4 @@
-.TH KWIN4PROC 6
+.TH TWIN4PROC 6
 .SH NAME
 twin4proc \- AI backend for twin4
 .SH DESCRIPTION
diff --git a/ubuntu/_base/core/tdegames/debian/kwin4-trinity.install b/ubuntu/_base/core/tdegames/debian/twin4-trinity.install
similarity index 100%
rename from ubuntu/_base/core/tdegames/debian/kwin4-trinity.install
rename to ubuntu/_base/core/tdegames/debian/twin4-trinity.install
diff --git a/ubuntu/_base/core/tdegames/debian/kwin4-trinity.links b/ubuntu/_base/core/tdegames/debian/twin4-trinity.links
similarity index 100%
rename from ubuntu/_base/core/tdegames/debian/kwin4-trinity.links
rename to ubuntu/_base/core/tdegames/debian/twin4-trinity.links
diff --git a/ubuntu/_base/core/tdegames/debian/kwin4-trinity.manpages b/ubuntu/_base/core/tdegames/debian/twin4-trinity.manpages
similarity index 100%
rename from ubuntu/_base/core/tdegames/debian/kwin4-trinity.manpages
rename to ubuntu/_base/core/tdegames/debian/twin4-trinity.manpages
diff --git a/ubuntu/_base/core/tdegames/debian/kwin4-trinity.menu b/ubuntu/_base/core/tdegames/debian/twin4-trinity.menu
similarity index 92%
rename from ubuntu/_base/core/tdegames/debian/kwin4-trinity.menu
rename to ubuntu/_base/core/tdegames/debian/twin4-trinity.menu
index 51f43cb8e..b0ac672f5 100644
--- a/ubuntu/_base/core/tdegames/debian/kwin4-trinity.menu
+++ b/ubuntu/_base/core/tdegames/debian/twin4-trinity.menu
@@ -2,8 +2,7 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KWin4"\
+	title="TWin4"\
 	icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
 	command="/opt/trinity/games/twin4"
-