diff --git a/lib/pry/commands/shell_mode.rb b/lib/pry/commands/shell_mode.rb
index 64db7668..ee521d3b 100644
--- a/lib/pry/commands/shell_mode.rb
+++ b/lib/pry/commands/shell_mode.rb
@@ -12,10 +12,10 @@ class Pry
       case _pry_.prompt
       when Pry::SHELL_PROMPT
         _pry_.pop_prompt
-        _pry_.custom_completions = _pry_.config.file_completer
+        _pry_.custom_completions = _pry_.config.file_completions
       else
         _pry_.push_prompt Pry::SHELL_PROMPT
-        _pry_.custom_completions = _pry_.config.command_completer
+        _pry_.custom_completions = _pry_.config.command_completions
       end
     end
   end
diff --git a/lib/pry/config/default.rb b/lib/pry/config/default.rb
index c5d9d48d..557e0cf8 100644
--- a/lib/pry/config/default.rb
+++ b/lib/pry/config/default.rb
@@ -33,8 +33,8 @@ class Pry::Config::Default
     :control_d_handler      => proc { Pry::DEFAULT_CONTROL_D_HANDLER },
     :memory_size            => proc { 100 },
     :extra_sticky_locals    => proc { {} },
-    :command_completer      => proc { proc { Pry.commands.commands.keys } },
-    :file_completer         => proc { proc { Dir["."] } },
+    :command_completions    => proc { proc { Pry.commands.commands.keys } },
+    :file_completions       => proc { proc { Dir["."] } },
     :completer              => proc { lazy_completer }
   }
 
diff --git a/lib/pry/pry_instance.rb b/lib/pry/pry_instance.rb
index b7458769..5db6a3fa 100644
--- a/lib/pry/pry_instance.rb
+++ b/lib/pry/pry_instance.rb
@@ -73,7 +73,7 @@ class Pry
     push_prompt(config.prompt)
     @input_array  = Pry::HistoryArray.new config.memory_size
     @output_array = Pry::HistoryArray.new config.memory_size
-    @custom_completions = config.command_completer
+    @custom_completions = config.command_completions
     push_initial_binding(options[:target])
     set_last_result nil
     @input_array << nil