diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
index ca9ca4f9899..6b556f77e8f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
@@ -134,6 +134,9 @@ class FunctionNameInspection : NamingConventionInspection(
 ) {
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
         return namedFunctionVisitor { function ->
+            if (function.hasModifier(KtTokens.OVERRIDE_KEYWORD)) {
+                return@namedFunctionVisitor
+            }
             if (!TestUtils.isInTestSourceContent(function)) {
                 verifyName(function, holder)
             }
@@ -170,6 +173,10 @@ abstract class PropertyNameInspectionBase protected constructor(
 
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
         return propertyVisitor { property ->
+            if (property.hasModifier(KtTokens.OVERRIDE_KEYWORD)) {
+                return@propertyVisitor
+            }
+
             if (property.getKind() == kind) {
                 verifyName(property, holder)
             }
diff --git a/idea/testData/inspections/naming/function/inspectionData/expected.xml b/idea/testData/inspections/naming/function/inspectionData/expected.xml
index 494e38f73fd..a2a09a2ada9 100644
--- a/idea/testData/inspections/naming/function/inspectionData/expected.xml
+++ b/idea/testData/inspections/naming/function/inspectionData/expected.xml
@@ -2,23 +2,22 @@
     <problem>
         <file>test.kt</file>
         <line>1</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
         <description>Function name &lt;code&gt;Foo&lt;/code&gt; should start with a lowercase letter #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>3</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
         <description>Function name &lt;code&gt;FOO_BAR&lt;/code&gt; should not contain underscores #loc</description>
     </problem>
     <problem>
         <file>test.kt</file>
         <line>7</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
         <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Class naming convention</problem_class>
         <description>Function name &lt;code&gt;`a b`&lt;/code&gt; may contain only letters and digits #loc</description>
     </problem>
+    <problem>
+        <file>test.kt</file>
+        <line>10</line>
+        <description>Function name &lt;code&gt;a_b&lt;/code&gt; should not contain underscores #loc</description>
+    </problem>
 </problems>
diff --git a/idea/testData/inspections/naming/function/test.kt b/idea/testData/inspections/naming/function/test.kt
index 81e7dae21af..4af97aae4cb 100644
--- a/idea/testData/inspections/naming/function/test.kt
+++ b/idea/testData/inspections/naming/function/test.kt
@@ -4,4 +4,12 @@ fun FOO_BAR() {}
 
 fun xyzzy() {}
 
-fun `a b`() {}
\ No newline at end of file
+fun `a b`() {}
+
+interface I {
+    fun a_b()
+}
+
+class C : I {
+    override fun a_b() {} // Shouldn't be reported
+}
\ No newline at end of file
diff --git a/idea/testData/inspections/naming/property/inspectionData/expected.xml b/idea/testData/inspections/naming/property/inspectionData/expected.xml
index 4713fb622c7..c4fcee5e78b 100644
--- a/idea/testData/inspections/naming/property/inspectionData/expected.xml
+++ b/idea/testData/inspections/naming/property/inspectionData/expected.xml
@@ -2,8 +2,11 @@
     <problem>
         <file>test.kt</file>
         <line>27</line>
-        <module>light_idea_test_case</module>
-        <entry_point TYPE="file" FQNAME="temp:///src/test.kt" />
         <description>Property name &lt;code&gt;_Foo&lt;/code&gt; should not start with an underscore #loc</description>
     </problem>
+    <problem>
+        <file>test.kt</file>
+        <line>37</line>
+        <description>Property name &lt;code&gt;Foo&lt;/code&gt; should start with a lowercase letter #loc</description>
+    </problem>
 </problems>
diff --git a/idea/testData/inspections/naming/property/test.kt b/idea/testData/inspections/naming/property/test.kt
index abc1562487e..99c50f2d317 100644
--- a/idea/testData/inspections/naming/property/test.kt
+++ b/idea/testData/inspections/naming/property/test.kt
@@ -31,4 +31,12 @@ class D {
 
         var FOO_BAR: Int = 0
     }
+}
+
+interface I {
+    val Foo: Int
+}
+
+class C : I {
+    override override val Foo = 1
 }
\ No newline at end of file