diff --git a/lib/fog/local/models/storage/directories.rb b/lib/fog/local/models/storage/directories.rb
index d3aa9dfbe..9d622c4a6 100644
--- a/lib/fog/local/models/storage/directories.rb
+++ b/lib/fog/local/models/storage/directories.rb
@@ -1,5 +1,5 @@
 require 'fog/collection'
-require 'fog/local/models/directory'
+require 'fog/local/models/storage/directory'
 
 module Fog
   module Local
@@ -7,7 +7,7 @@ module Fog
 
       class Directories < Fog::Collection
 
-        model Fog::Local::Directory
+        model Fog::Local::Storage::Directory
 
         def all
           data = Dir.entries(connection.local_root).select do |entry|
diff --git a/lib/fog/local/models/storage/directory.rb b/lib/fog/local/models/storage/directory.rb
index cbf33d67e..c7edb2402 100644
--- a/lib/fog/local/models/storage/directory.rb
+++ b/lib/fog/local/models/storage/directory.rb
@@ -25,7 +25,7 @@ module Fog
 
         def files
           @files ||= begin
-            Fog::Local::Files.new(
+            Fog::Local::Storage::Files.new(
               :directory    => self,
               :connection   => connection
             )
diff --git a/lib/fog/local/models/storage/file.rb b/lib/fog/local/models/storage/file.rb
index 4786b65be..5825d58e4 100644
--- a/lib/fog/local/models/storage/file.rb
+++ b/lib/fog/local/models/storage/file.rb
@@ -6,7 +6,7 @@ module Fog
 
       class File < Fog::Model
 
-        identity  :key,             'Key'
+        identity  :key,             :aliases => 'Key'
 
         attr_accessor :body
         attribute :content_length,  :aliases => 'Content-Length'
diff --git a/lib/fog/local/models/storage/files.rb b/lib/fog/local/models/storage/files.rb
index 06889137f..fe19c0fd9 100644
--- a/lib/fog/local/models/storage/files.rb
+++ b/lib/fog/local/models/storage/files.rb
@@ -9,7 +9,7 @@ module Fog
 
         attribute :directory
 
-        model Fog::Local::File
+        model Fog::Local::Storage::File
 
         def all
           requires :directory