diff --git a/DateTime.cpp b/DateTime.cpp
index f406ee9..6c0062a 100644
--- a/DateTime.cpp
+++ b/DateTime.cpp
@@ -5,7 +5,7 @@
 #include <ctime>
 #include <cstring>
 
-namespace ProDOS {
+using namespace ProFUSE;
 
 /*
  *  date is a 16 bit value:
diff --git a/DateTime.h b/DateTime.h
index 9f3aa78..24055d4 100644
--- a/DateTime.h
+++ b/DateTime.h
@@ -4,7 +4,7 @@
 #include <ctime>
 #include <stdint.h>
 
-namespace ProDOS {
+namespace ProFUSE {
 
 class DateTime
 {
diff --git a/Directory.h b/Entry.h
similarity index 99%
rename from Directory.h
rename to Entry.h
index 1b317f8..64cd21a 100644
--- a/Directory.h
+++ b/Entry.h
@@ -13,6 +13,7 @@ class BlockDevice;
 class Bitmap;
 class FileEntry;
 class Volume;
+class Buffer;
 
 
 enum Access {