diff --git a/common_texts.cpp b/common_texts.cpp
index 976f61a35..d23fc3a07 100644
--- a/common_texts.cpp
+++ b/common_texts.cpp
@@ -191,66 +191,66 @@ i18n( "Configure &Key Bindings...");
 i18n( "&Preferences...");
 i18n( "&Settings");
 i18n( "Do not show this message again");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Escape");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Tab");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Backtab");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Backspace");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Return");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Enter");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Insert");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Delete");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Pause");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Print");
-i18n(TQACCEL_OBJECT_NAME_STRING, "SysReq");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Home");
-i18n(TQACCEL_OBJECT_NAME_STRING, "End");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Left");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Up");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Right");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Down");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Prior");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Next");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Shift");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Control");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Meta");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Alt");
-i18n(TQACCEL_OBJECT_NAME_STRING, "CapsLock");
-i18n(TQACCEL_OBJECT_NAME_STRING, "NumLock");
-i18n(TQACCEL_OBJECT_NAME_STRING, "ScrollLock");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Space");
-i18n(TQACCEL_OBJECT_NAME_STRING, "ParenLeft");
-i18n(TQACCEL_OBJECT_NAME_STRING, "ParenRight");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Asterisk");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Plus");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Comma");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Minus");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Period");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Slash");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Colon");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Semicolon");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Less");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Equal");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Greater");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Question");
-i18n(TQACCEL_OBJECT_NAME_STRING, "BracketLeft");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Backslash");
-i18n(TQACCEL_OBJECT_NAME_STRING, "BracketRight");
-i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiCircum");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Underscore");
-i18n(TQACCEL_OBJECT_NAME_STRING, "QuoteLeft");
-i18n(TQACCEL_OBJECT_NAME_STRING, "BraceLeft");
-i18n(TQACCEL_OBJECT_NAME_STRING, "BraceRight");
-i18n(TQACCEL_OBJECT_NAME_STRING, "AsciiTilde");
-i18n(TQACCEL_OBJECT_NAME_STRING, "PgUp");
-i18n(TQACCEL_OBJECT_NAME_STRING, "PgDown");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Apostrophe");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Ampersand");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Exclam");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Dollar");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Percent");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Menu");
-i18n(TQACCEL_OBJECT_NAME_STRING, "Help");
-i18n(TQACCEL_OBJECT_NAME_STRING, "NumberSign");
+i18n("TQAccel", "Escape");
+i18n("TQAccel", "Tab");
+i18n("TQAccel", "Backtab");
+i18n("TQAccel", "Backspace");
+i18n("TQAccel", "Return");
+i18n("TQAccel", "Enter");
+i18n("TQAccel", "Insert");
+i18n("TQAccel", "Delete");
+i18n("TQAccel", "Pause");
+i18n("TQAccel", "Print");
+i18n("TQAccel", "SysReq");
+i18n("TQAccel", "Home");
+i18n("TQAccel", "End");
+i18n("TQAccel", "Left");
+i18n("TQAccel", "Up");
+i18n("TQAccel", "Right");
+i18n("TQAccel", "Down");
+i18n("TQAccel", "Prior");
+i18n("TQAccel", "Next");
+i18n("TQAccel", "Shift");
+i18n("TQAccel", "Control");
+i18n("TQAccel", "Meta");
+i18n("TQAccel", "Alt");
+i18n("TQAccel", "CapsLock");
+i18n("TQAccel", "NumLock");
+i18n("TQAccel", "ScrollLock");
+i18n("TQAccel", "Space");
+i18n("TQAccel", "ParenLeft");
+i18n("TQAccel", "ParenRight");
+i18n("TQAccel", "Asterisk");
+i18n("TQAccel", "Plus");
+i18n("TQAccel", "Comma");
+i18n("TQAccel", "Minus");
+i18n("TQAccel", "Period");
+i18n("TQAccel", "Slash");
+i18n("TQAccel", "Colon");
+i18n("TQAccel", "Semicolon");
+i18n("TQAccel", "Less");
+i18n("TQAccel", "Equal");
+i18n("TQAccel", "Greater");
+i18n("TQAccel", "Question");
+i18n("TQAccel", "BracketLeft");
+i18n("TQAccel", "Backslash");
+i18n("TQAccel", "BracketRight");
+i18n("TQAccel", "AsciiCircum");
+i18n("TQAccel", "Underscore");
+i18n("TQAccel", "QuoteLeft");
+i18n("TQAccel", "BraceLeft");
+i18n("TQAccel", "BraceRight");
+i18n("TQAccel", "AsciiTilde");
+i18n("TQAccel", "PgUp");
+i18n("TQAccel", "PgDown");
+i18n("TQAccel", "Apostrophe");
+i18n("TQAccel", "Ampersand");
+i18n("TQAccel", "Exclam");
+i18n("TQAccel", "Dollar");
+i18n("TQAccel", "Percent");
+i18n("TQAccel", "Menu");
+i18n("TQAccel", "Help");
+i18n("TQAccel", "NumberSign");
 i18n("Main Toolbar");
 
 //some font styles
diff --git a/tdecore/kkeyserver_x11.cpp b/tdecore/kkeyserver_x11.cpp
index 283c87ce6..e07613607 100644
--- a/tdecore/kkeyserver_x11.cpp
+++ b/tdecore/kkeyserver_x11.cpp
@@ -530,7 +530,7 @@ TQString Sym::toString( bool bUserSpace ) const
 	s = XKeysymToString( m_sym );
 #endif
 	capitalizeKeyname( s );
-	return bUserSpace ? i18n(TQACCEL_OBJECT_NAME_STRING, s.latin1()) : s;
+	return bUserSpace ? i18n("TQAccel", s.latin1()) : s;
 }
 
 TQString Sym::toStringInternal() const { return toString( false ); }
diff --git a/tdecore/tests/klocaletest.cpp b/tdecore/tests/klocaletest.cpp
index 36f301d6c..2b02c22a4 100644
--- a/tdecore/tests/klocaletest.cpp
+++ b/tdecore/tests/klocaletest.cpp
@@ -182,11 +182,11 @@ int main( int argc, char ** argv )
 
   kdDebug() << "setLanguage C\n";
   TDEGlobal::locale()->setLanguage(TQString::fromLatin1("C"));
-  kdDebug() << "C: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
+  kdDebug() << "C: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
 
   kdDebug() << "setLanguage de\n";
   TDEGlobal::locale()->setLanguage(TQString::fromLatin1("de"));
-  kdDebug() << "de: " << i18n("yes") << " " << i18n(TQACCEL_OBJECT_NAME_STRING, "Space") << endl;
+  kdDebug() << "de: " << i18n("yes") << " " << i18n("TQAccel", "Space") << endl;
 
 
   Test m;