diff --git a/spec/ameba/rule/lint/not_nil_with_no_bang_spec.cr b/spec/ameba/rule/lint/not_nil_after_no_bang_spec.cr
similarity index 97%
rename from spec/ameba/rule/lint/not_nil_with_no_bang_spec.cr
rename to spec/ameba/rule/lint/not_nil_after_no_bang_spec.cr
index 17ef16eb..521b79ef 100644
--- a/spec/ameba/rule/lint/not_nil_with_no_bang_spec.cr
+++ b/spec/ameba/rule/lint/not_nil_after_no_bang_spec.cr
@@ -1,9 +1,9 @@
 require "../../../spec_helper"
 
 module Ameba::Rule::Lint
-  subject = NotNilWithNoBang.new
+  subject = NotNilAfterNoBang.new
 
-  describe NotNilWithNoBang do
+  describe NotNilAfterNoBang do
     it "passes for valid cases" do
       expect_no_issues subject, <<-CRYSTAL
         (1..3).index(1).not_nil!(:foo)
diff --git a/src/ameba/rule/lint/not_nil_with_no_bang.cr b/src/ameba/rule/lint/not_nil_after_no_bang.cr
similarity index 96%
rename from src/ameba/rule/lint/not_nil_with_no_bang.cr
rename to src/ameba/rule/lint/not_nil_after_no_bang.cr
index a1e55a30..d222c43e 100644
--- a/src/ameba/rule/lint/not_nil_with_no_bang.cr
+++ b/src/ameba/rule/lint/not_nil_after_no_bang.cr
@@ -16,10 +16,10 @@ module Ameba::Rule::Lint
   # YAML configuration example:
   #
   # ```
-  # Lint/NotNilWithNoBang:
+  # Lint/NotNilAfterNoBang:
   #   Enabled: true
   # ```
-  class NotNilWithNoBang < Base
+  class NotNilAfterNoBang < Base
     include AST::Util
 
     properties do