diff --git a/kexi/data/kde34compat/Makefile.am b/kexi/data/trinity4compat/Makefile.am
similarity index 100%
rename from kexi/data/kde34compat/Makefile.am
rename to kexi/data/trinity4compat/Makefile.am
diff --git a/kexi/data/kde34compat/msaccess.magic b/kexi/data/trinity4compat/msaccess.magic
similarity index 100%
rename from kexi/data/kde34compat/msaccess.magic
rename to kexi/data/trinity4compat/msaccess.magic
diff --git a/kexi/data/kde34compat/sqlite.magic b/kexi/data/trinity4compat/sqlite.magic
similarity index 100%
rename from kexi/data/kde34compat/sqlite.magic
rename to kexi/data/trinity4compat/sqlite.magic
diff --git a/kexi/data/kde34compat/x-sqlite2.desktop b/kexi/data/trinity4compat/x-sqlite2.desktop
similarity index 100%
rename from kexi/data/kde34compat/x-sqlite2.desktop
rename to kexi/data/trinity4compat/x-sqlite2.desktop
diff --git a/kexi/data/kde34compat/x-sqlite3.desktop b/kexi/data/trinity4compat/x-sqlite3.desktop
similarity index 100%
rename from kexi/data/kde34compat/x-sqlite3.desktop
rename to kexi/data/trinity4compat/x-sqlite3.desktop
diff --git a/kpresenter/templates/Screenpresentations/hi48-action-template_kde3.png b/kpresenter/templates/Screenpresentations/hi48-action-template_trinity.png
similarity index 100%
rename from kpresenter/templates/Screenpresentations/hi48-action-template_kde3.png
rename to kpresenter/templates/Screenpresentations/hi48-action-template_trinity.png
diff --git a/kpresenter/templates/Screenpresentations/kde3.desktop b/kpresenter/templates/Screenpresentations/trinity.desktop
similarity index 100%
rename from kpresenter/templates/Screenpresentations/kde3.desktop
rename to kpresenter/templates/Screenpresentations/trinity.desktop
diff --git a/kpresenter/templates/Screenpresentations/kde3.kpt b/kpresenter/templates/Screenpresentations/trinity.kpt
similarity index 100%
rename from kpresenter/templates/Screenpresentations/kde3.kpt
rename to kpresenter/templates/Screenpresentations/trinity.kpt
diff --git a/mimetypes/kde33/Makefile.am b/mimetypes/trinity3/Makefile.am
similarity index 100%
rename from mimetypes/kde33/Makefile.am
rename to mimetypes/trinity3/Makefile.am
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.chart.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.chart.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.chart.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.formula.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.formula.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.formula.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.formula.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.graphics-template.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.graphics-template.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.graphics.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.graphics.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.image.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.image.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.image.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.image.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.presentation-template.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.presentation-template.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.presentation.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.presentation.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.spreadsheet-template.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet-template.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.spreadsheet.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.spreadsheet.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.text-template.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.text-template.desktop
diff --git a/mimetypes/kde33/vnd.oasis.opendocument.text.desktop b/mimetypes/trinity3/vnd.oasis.opendocument.text.desktop
similarity index 100%
rename from mimetypes/kde33/vnd.oasis.opendocument.text.desktop
rename to mimetypes/trinity3/vnd.oasis.opendocument.text.desktop
diff --git a/mimetypes/kde351/Makefile.am b/mimetypes/trinity51/Makefile.am
similarity index 100%
rename from mimetypes/kde351/Makefile.am
rename to mimetypes/trinity51/Makefile.am
diff --git a/mimetypes/kde351/x-raw.desktop b/mimetypes/trinity51/x-raw.desktop
similarity index 100%
rename from mimetypes/kde351/x-raw.desktop
rename to mimetypes/trinity51/x-raw.desktop