diff --git a/warn/warn_naming.go b/warn/warn_naming.go
index 24a7cf401..25e394ce9 100644
--- a/warn/warn_naming.go
+++ b/warn/warn_naming.go
@@ -103,12 +103,12 @@ func nameConventionsWarning(f *build.File) []*LinterFinding {
 			if isLowerSnakeCase(ident.Name) || isUpperSnakeCase(ident.Name) {
 				continue
 			}
-			if isUpperCamelCase(ident.Name) && strings.HasSuffix(ident.Name, "Info") {
+			if isUpperCamelCase(ident.Name) {
 				continue
 			}
 			findings = append(findings,
 				makeLinterFinding(ident,
-					fmt.Sprintf(`Variable name "%s" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`, ident.Name)))
+					fmt.Sprintf(`Variable name "%s" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`, ident.Name)))
 		}
 		return
 	})
diff --git a/warn/warn_naming_test.go b/warn/warn_naming_test.go
index 538e32bfa..a3bf48b4a 100644
--- a/warn/warn_naming_test.go
+++ b/warn/warn_naming_test.go
@@ -111,11 +111,9 @@ _baz = 14
 _Foo_bar, foo_Baz = 15, 16
 `,
 		[]string{
-			`:4: Variable name "Foo" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:5: Variable name "Bar" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:7: Variable name "fOO" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:12: Variable name "_Foo_bar" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:12: Variable name "foo_Baz" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
+			`:7: Variable name "fOO" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`,
+			`:12: Variable name "_Foo_bar" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`,
+			`:12: Variable name "foo_Baz" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`,
 		}, scopeEverywhere)
 
 	checkFindings(t, "name-conventions", `
@@ -134,11 +132,9 @@ def f(x, _, Arg = None):
   _Foo_bar, foo_Baz = 15, 16
 `,
 		[]string{
-			`:5: Variable name "Foo" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:6: Variable name "Bar" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:8: Variable name "fOO" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:13: Variable name "_Foo_bar" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
-			`:13: Variable name "foo_Baz" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase ending with 'Info' (for providers).`,
+			`:8: Variable name "fOO" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`,
+			`:13: Variable name "_Foo_bar" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`,
+			`:13: Variable name "foo_Baz" should be lower_snake_case (for variables), UPPER_SNAKE_CASE (for constants), or UpperCamelCase (for providers).`,
 		}, scopeEverywhere)
 
 	checkFindings(t, "name-conventions", `