diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 9987b9693ae..fb20b59d320 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -2473,6 +2473,11 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0
 </context>
 <context>
     <name>CppFileSettingsPage</name>
+    <message>
+        <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
+        <source>File naming conventions</source>
+        <translation>Konventionen für die Bildung von Dateinamen</translation>
+    </message>
     <message>
         <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
         <source>Header suffix:</source>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 08daf84d4b6..995bd40374e 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -2301,6 +2301,11 @@ p {
 </context>
 <context>
     <name>CppFileSettingsPage</name>
+    <message>
+        <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+52"/>
+        <source>File naming conventions</source>
+        <translation>Convenzioni sul nome dei file</translation>
+    </message>
     <message>
         <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
         <source>Header suffix:</source>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 1d8cf823d30..37e64239468 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -2224,6 +2224,11 @@ background-image: url(:/core/images/welcomemode/feedback-bar-background.png);
 </context>
 <context>
     <name>CppFileSettingsPage</name>
+    <message>
+        <location filename="../../../src/plugins/cpptools/cpptoolsconstants.h" line="+51"/>
+        <source>File naming conventions</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../../../src/plugins/cpptools/cppfilesettingspage.ui"/>
         <source>Form</source>
diff --git a/src/plugins/cpptools/cppfilesettingspage.ui b/src/plugins/cpptools/cppfilesettingspage.ui
index f4cf62506f0..61bf7880f0c 100644
--- a/src/plugins/cpptools/cppfilesettingspage.ui
+++ b/src/plugins/cpptools/cppfilesettingspage.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>CppFileSettingsPage</class>
- <widget class="QWidget" name="CppFileSettingsPage">
-  <property name="geometry">
+ <widget class="QWidget" name="CppFileSettingsPage" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,70 +10,58 @@
     <height>503</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout" >
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <layout class="QFormLayout" name="formLayout">
-       <property name="fieldGrowthPolicy">
-        <enum>QFormLayout::ExpandingFieldsGrow</enum>
-       </property>
-       <item row="0" column="0">
-        <widget class="QLabel" name="headerSuffixLabel">
-         <property name="text">
-          <string>Header suffix:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QComboBox" name="headerSuffixComboBox"/>
-       </item>
-       <item row="2" column="0">
-        <widget class="QLabel" name="lowerCaseFileNamesLabel">
-         <property name="toolTip">
-          <string>This determines how the file names of the class wizards are generated (&quot;MyClass.h&quot; versus &quot;myclass.h&quot;).</string>
-         </property>
-         <property name="text">
-          <string>Lower case file names:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QCheckBox" name="lowerCaseFileNamesCheckBox"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="sourceSuffixLabel">
-         <property name="text">
-          <string>Source suffix:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QComboBox" name="sourceSuffixComboBox"/>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title" >
+      <string>File naming conventions</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout" >
+      <property name="fieldGrowthPolicy" >
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="headerSuffixLabel" >
+        <property name="text" >
+         <string>Header suffix:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QComboBox" name="headerSuffixComboBox" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="sourceSuffixLabel" >
+        <property name="text" >
+         <string>Source suffix:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="sourceSuffixComboBox" />
+      </item>
+      <item row="2" column="1" >
+       <widget class="QCheckBox" name="lowerCaseFileNamesCheckBox" >
+        <property name="text" >
+         <string>Lower case file names</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
    <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>20</width>
        <height>430</height>