diff --git a/INSTALL b/INSTALL
index 98a5258..23e5f25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -113,7 +113,7 @@ pass the option `--exec-prefix=PREFIX' to `configure', the package uses
 PREFIX as the prefix for installing programs and libraries.
 Documentation and other data files still use the regular prefix.
 
-   In addition, if you use an unusual directory tqlayout you can give
+   In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
diff --git a/src/blacklistedit_Dialog.ui b/src/blacklistedit_Dialog.ui
index 557aea5..d916c05 100644
--- a/src/blacklistedit_Dialog.ui
+++ b/src/blacklistedit_Dialog.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/src/configure_Dialog.ui b/src/configure_Dialog.ui
index 98005da..98f2dfb 100644
--- a/src/configure_Dialog.ui
+++ b/src/configure_Dialog.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -1078,7 +1078,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout3</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <grid>
                             <property name="name">
diff --git a/src/detailed_Dialog.ui b/src/detailed_Dialog.ui
index 89f16f1..46309ff 100644
--- a/src/detailed_Dialog.ui
+++ b/src/detailed_Dialog.ui
@@ -66,7 +66,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout17</cstring>
+                            <cstring>layout17</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -137,7 +137,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout18</cstring>
+                        <cstring>layout18</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -230,7 +230,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout15</cstring>
+                        <cstring>layout15</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -238,7 +238,7 @@
                         </property>
                         <widget class="TQLayoutWidget" row="3" column="0">
                             <property name="name">
-                                <cstring>tqlayout14</cstring>
+                                <cstring>layout14</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -397,7 +397,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12</cstring>
+                        <cstring>layout12</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -473,7 +473,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout12_2</cstring>
+                        <cstring>layout12_2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -543,7 +543,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout16</cstring>
+                            <cstring>layout16</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -592,7 +592,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout19</cstring>
+                <cstring>layout19</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/src/log_viewer.ui b/src/log_viewer.ui
index 3af258a..d4be935 100644
--- a/src/log_viewer.ui
+++ b/src/log_viewer.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -37,7 +37,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">