diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
index f11ebc2e24d..3c575098a60 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
@@ -107,7 +107,7 @@ class NamingConventionInspectionSettings(
             val message = getNameMismatchMessage(name)
             holder.registerProblem(
                 element.nameIdentifier!!,
-                "$entityName ${KotlinBundle.message("text.name")}<code>#ref</code> $message #loc",
+                "$entityName ${KotlinBundle.message("text.name")} <code>#ref</code> $message #loc",
                 RenameIdentifierFix()
             )
         }
diff --git a/idea/testData/inspections/naming/function/inspectionData/expected.xml b/idea/testData/inspections/naming/function/inspectionData/expected.xml
index a2a09a2ada9..8c71c90ec96 100644
--- a/idea/testData/inspections/naming/function/inspectionData/expected.xml
+++ b/idea/testData/inspections/naming/function/inspectionData/expected.xml
@@ -20,4 +20,16 @@
         <line>10</line>
         <description>Function name &lt;code&gt;a_b&lt;/code&gt; should not contain underscores #loc</description>
     </problem>
+    <problem>
+        <file>test.kt</file>
+        <line>17</line>
+        <module>light_idea_test_case</module>
+        <package>test</package>
+        <entry_point TYPE="method" FQNAME="test.TestKt int Vector3d()" />
+        <problem_class id="FunctionName" severity="WEAK WARNING" attribute_key="INFO_ATTRIBUTES">Function naming convention</problem_class>
+        <description>Function name &lt;code&gt;Vector3d&lt;/code&gt; should start with a lowercase letter #loc</description>
+        <highlighted_element>Vector3d</highlighted_element>
+        <offset>4</offset>
+        <length>8</length>
+    </problem>
 </problems>
diff --git a/idea/testData/inspections/naming/function/test.kt b/idea/testData/inspections/naming/function/test.kt
index 4af97aae4cb..ef9100f6dc2 100644
--- a/idea/testData/inspections/naming/function/test.kt
+++ b/idea/testData/inspections/naming/function/test.kt
@@ -12,4 +12,6 @@ interface I {
 
 class C : I {
     override fun a_b() {} // Shouldn't be reported
-}
\ No newline at end of file
+}
+
+fun Vector3d(): Int = 42