diff --git a/Gemfile b/Gemfile
index 840cb87..f80e1a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,3 +12,4 @@ group :test do
 end
 
 gem "vulcano", :git => "git@github.com:chef/vulcanosec.git"
+gem 'train', git: 'git@github.com:chef/train.git'
diff --git a/bin/console b/bin/console
index f3a3658..71a3bb4 100755
--- a/bin/console
+++ b/bin/console
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "kitchen/audit"
+require "kitchen/inspec"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
diff --git a/kitchen-audit.gemspec b/kitchen-inspec.gemspec
similarity index 100%
rename from kitchen-audit.gemspec
rename to kitchen-inspec.gemspec
diff --git a/lib/kitchen/verifier/audit.rb b/lib/kitchen/verifier/inspec.rb
similarity index 92%
rename from lib/kitchen/verifier/audit.rb
rename to lib/kitchen/verifier/inspec.rb
index a830ec3..18f4806 100644
--- a/lib/kitchen/verifier/audit.rb
+++ b/lib/kitchen/verifier/inspec.rb
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@chef.io>)
+# Author:: Christoph Hartmann (<chartmann@chef.io>)
 #
 # Copyright (C) 2015, Chef Software Inc.
 #
@@ -16,21 +17,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/verifier/audit_version"
+require "kitchen/verifier/inspec_version"
 require "kitchen/verifier/base"
 
 module Kitchen
 
   module Verifier
 
-    # Audit verifier for Kitchen.
+    # InSpec verifier for Kitchen.
     #
     # @author Fletcher Nichol <fnichol@chef.io>
-    class Audit < Kitchen::Verifier::Base
+    class InSpec < Kitchen::Verifier::Base
 
       kitchen_verifier_api_version 1
 
-      plugin_version Kitchen::Verifier::AUDIT_VERSION
+      plugin_version Kitchen::Verifier::INSPEC_VERSION
 
       # (see Base#call)
       def call(state)
@@ -88,13 +89,12 @@ def local_suite_files
       # @api private
       def runner_options_for_ssh(config_data)
         opts = instance.transport.send(:connection_options, config_data).dup
-
         {
           "backend" => "ssh",
           "host" => opts[:hostname],
           "port" => opts[:port],
           "user" => opts[:username],
-          "key_file" => opts[:keys]
+          "key_files" => opts[:keys]
         }
       end
     end
diff --git a/lib/kitchen/verifier/audit_version.rb b/lib/kitchen/verifier/inspec_version.rb
similarity index 84%
rename from lib/kitchen/verifier/audit_version.rb
rename to lib/kitchen/verifier/inspec_version.rb
index 15222d8..41f2fff 100644
--- a/lib/kitchen/verifier/audit_version.rb
+++ b/lib/kitchen/verifier/inspec_version.rb
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@chef.io>)
+# Author:: Christoph Hartmann (<chartmann@chef.io>)
 #
 # Copyright (C) 2015, Chef Software Inc.
 #
@@ -20,7 +21,7 @@ module Kitchen
 
   module Verifier
 
-    # Version string for Audit Kitchen verifier
-    AUDIT_VERSION = "0.1.0"
+    # Version string for InSpec Kitchen verifier
+    INSPEC_VERSION = "0.1.0"
   end
 end
diff --git a/spec/kitchen/verifier/audit_spec.rb b/spec/kitchen/verifier/inspec_spec.rb
similarity index 91%
rename from spec/kitchen/verifier/audit_spec.rb
rename to spec/kitchen/verifier/inspec_spec.rb
index 8462132..4e6dcd9 100644
--- a/spec/kitchen/verifier/audit_spec.rb
+++ b/spec/kitchen/verifier/inspec_spec.rb
@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@chef.io>)
+# Author:: Christoph Hartmann (<chartmann@chef.io>)
 #
 # Copyright (C) 2015, Chef Software Inc.
 #
@@ -20,10 +21,10 @@
 
 require "logger"
 
-require "kitchen/verifier/audit"
+require "kitchen/verifier/inspec"
 require "kitchen/transport/ssh"
 
-describe Kitchen::Verifier::Audit do
+describe Kitchen::Verifier::InSpec do
 
   let(:logged_output)     { StringIO.new }
   let(:logger)            { Logger.new(logged_output) }
@@ -72,16 +73,16 @@
   end
 
   let(:verifier) do
-    Kitchen::Verifier::Audit.new(config).finalize_config!(instance)
+    Kitchen::Verifier::InSpec.new(config).finalize_config!(instance)
   end
 
   it "verifier api_version is 1" do
     expect(verifier.diagnose_plugin[:api_version]).to eq(1)
   end
 
-  it "plugin_version is set to Kitchen::Verifier::AUDIT_VERSION" do
+  it "plugin_version is set to Kitchen::Verifier::INSPEC_VERSION" do
     expect(verifier.diagnose_plugin[:version]).
-      to eq(Kitchen::Verifier::AUDIT_VERSION)
+      to eq(Kitchen::Verifier::INSPEC_VERSION)
   end
 
   describe "configuration" do
@@ -119,7 +120,7 @@
           "host" => "boogie",
           "port" => 123,
           "user" => "dance",
-          "key_file" => ["/backstage/pass"]
+          "key_files" => ["/backstage/pass"]
         )).
         and_return(runner)