diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0bd77b10..83ced97a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-08-31 21:54:20 +1000 using RuboCop version 0.74.0.
+# on 2019-09-11 06:34:25 +1000 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -26,6 +26,14 @@ Lint/AssignmentInCondition:
     - 'test/test_helper.rb'
     - 'test/unit/tokenizer_unit_test.rb'
 
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: runtime_error, standard_error
+Lint/InheritException:
+  Exclude:
+    - 'lib/liquid/interrupts.rb'
+
 # Offense count: 2
 Lint/UselessAssignment:
   Exclude:
@@ -44,9 +52,24 @@ Lint/Void:
 Metrics/LineLength:
   Max: 294
 
-# Offense count: 45
+# Offense count: 44
 Naming/ConstantName:
-  Enabled: false
+  Exclude:
+    - 'lib/liquid.rb'
+    - 'lib/liquid/block_body.rb'
+    - 'lib/liquid/tags/assign.rb'
+    - 'lib/liquid/tags/capture.rb'
+    - 'lib/liquid/tags/case.rb'
+    - 'lib/liquid/tags/cycle.rb'
+    - 'lib/liquid/tags/for.rb'
+    - 'lib/liquid/tags/if.rb'
+    - 'lib/liquid/tags/include.rb'
+    - 'lib/liquid/tags/raw.rb'
+    - 'lib/liquid/tags/table_row.rb'
+    - 'lib/liquid/variable.rb'
+    - 'performance/shopify/comment_form.rb'
+    - 'performance/shopify/paginate.rb'
+    - 'test/integration/tags/include_tag_test.rb'
 
 # Offense count: 5
 Style/ClassVars:
diff --git a/lib/liquid/interrupts.rb b/lib/liquid/interrupts.rb
index 48a820c7..41359d78 100644
--- a/lib/liquid/interrupts.rb
+++ b/lib/liquid/interrupts.rb
@@ -1,6 +1,6 @@
 module Liquid
-  # A block interrupt is any command that breaks processing of a block (ex: a for loop).
-  class BlockInterrupt
+  # An interrupt is any command that breaks processing of a block (ex: a for loop).
+  class Interrupt
     attr_reader :message
 
     def initialize(message = nil)
@@ -9,8 +9,8 @@ module Liquid
   end
 
   # Interrupt that is thrown whenever a {% break %} is called.
-  class BreakInterrupt < BlockInterrupt; end
+  class BreakInterrupt < Interrupt; end
 
   # Interrupt that is thrown whenever a {% continue %} is called.
-  class ContinueInterrupt < BlockInterrupt; end
+  class ContinueInterrupt < Interrupt; end
 end