diff --git a/.rubocop.yml b/.rubocop.yml
index 4ba7e1d5d..0167eb51d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,50 +1,50 @@
 inherit_from: .rubocop_todo.yml
 
-Lint/AmbiguousBlockAssociation:
-  Enabled: false
-
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-Style/AlignHash:
+Layout/AlignHash:
   EnforcedLastArgumentHashStyle: always_ignore
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
-Style/AndOr:
-  EnforcedStyle: conditionals
-
-Style/CaseIndentation:
+Layout/CaseIndentation:
   EnforcedStyle: end
 
-Style/DoubleNegation:
-  Enabled: false
-
-Style/IndentArray:
+Layout/IndentArray:
   EnforcedStyle: consistent
 
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
 
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Lint/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Style/Alias:
+  EnforcedStyle: prefer_alias_method
+
+Style/AndOr:
+  EnforcedStyle: conditionals
+
+Style/DoubleNegation:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - '**/*_spec.rb'
diff --git a/Appraisals b/Appraisals
index 767281220..46baf94a5 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,5 +1,3 @@
-# rubocop:disable Style/FileName
-
 %w[4.0 4.1 4.2].each do |activesupport|
   appraise "rails.#{activesupport}.activerecord" do
     gem 'activerecord', "~> #{activesupport}.0"
diff --git a/chewy.gemspec b/chewy.gemspec
index 157ed527e..c24236ae3 100644
--- a/chewy.gemspec
+++ b/chewy.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec| # rubocop:disable BlockLength
   spec.add_development_dependency 'elasticsearch-extensions'
   spec.add_development_dependency 'resque_spec'
   spec.add_development_dependency 'timecop'
-  spec.add_development_dependency 'rubocop', '0.48.1'
+  spec.add_development_dependency 'rubocop', '0.49.1'
 
   spec.add_development_dependency 'method_source'
   spec.add_development_dependency 'unparser'