diff --git a/src/nt_messagereader.cpp b/src/MessageReader.cpp
similarity index 98%
rename from src/nt_messagereader.cpp
rename to src/MessageReader.cpp
index f0aca4f249..37b308cc27 100644
--- a/src/nt_messagereader.cpp
+++ b/src/MessageReader.cpp
@@ -5,14 +5,14 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_messagereader.h"
+#include "MessageReader.h"
 
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
 
-#include "nt_internal.h"
-#include "nt_leb128.h"
+#include "internal.h"
+#include "leb128.h"
 
 using namespace ntimpl;
 
diff --git a/src/nt_messagereader.h b/src/MessageReader.h
similarity index 98%
rename from src/nt_messagereader.h
rename to src/MessageReader.h
index d0a659f01e..fbcfbc2de2 100644
--- a/src/nt_messagereader.h
+++ b/src/MessageReader.h
@@ -8,7 +8,7 @@
 #ifndef NT_MESSAGEREADER_H_
 #define NT_MESSAGEREADER_H_
 
-#include "nt_wiredecoder.h"
+#include "WireDecoder.h"
 
 namespace ntimpl {
 
diff --git a/src/nt_messagewriter.cpp b/src/MessageWriter.cpp
similarity index 98%
rename from src/nt_messagewriter.cpp
rename to src/MessageWriter.cpp
index 3e20815527..f091874235 100644
--- a/src/nt_messagewriter.cpp
+++ b/src/MessageWriter.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_messagewriter.h"
+#include "MessageWriter.h"
 
-#include "nt_internal.h"
+#include "internal.h"
 
 using namespace ntimpl;
 
diff --git a/src/nt_messagewriter.h b/src/MessageWriter.h
similarity index 98%
rename from src/nt_messagewriter.h
rename to src/MessageWriter.h
index 2a5ee79e4c..a8f81e405b 100644
--- a/src/nt_messagewriter.h
+++ b/src/MessageWriter.h
@@ -8,7 +8,7 @@
 #ifndef NT_MESSAGEWRITER_H_
 #define NT_MESSAGEWRITER_H_
 
-#include "nt_wireencoder.h"
+#include "WireEncoder.h"
 
 namespace ntimpl {
 
diff --git a/src/nt_seqnum.cpp b/src/SequenceNumber.cpp
similarity index 97%
rename from src/nt_seqnum.cpp
rename to src/SequenceNumber.cpp
index 7f0c44db23..91a9bda128 100644
--- a/src/nt_seqnum.cpp
+++ b/src/SequenceNumber.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_seqnum.h"
+#include "SequenceNumber.h"
 
 namespace ntimpl {
 
diff --git a/src/nt_seqnum.h b/src/SequenceNumber.h
similarity index 100%
rename from src/nt_seqnum.h
rename to src/SequenceNumber.h
diff --git a/src/nt_storage.cpp b/src/Storage.cpp
similarity index 96%
rename from src/nt_storage.cpp
rename to src/Storage.cpp
index 83ad64d36e..25ccc8e8eb 100644
--- a/src/nt_storage.cpp
+++ b/src/Storage.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_storage.h"
+#include "Storage.h"
 
 using namespace ntimpl;
 
diff --git a/src/nt_storage.h b/src/Storage.h
similarity index 100%
rename from src/nt_storage.h
rename to src/Storage.h
diff --git a/src/nt_value.cpp b/src/Value.cpp
similarity index 99%
rename from src/nt_value.cpp
rename to src/Value.cpp
index 22e7da4125..57c1e843ad 100644
--- a/src/nt_value.cpp
+++ b/src/Value.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_value.h"
+#include "Value.h"
 
 #include <cassert>
 #include <cstring>
diff --git a/src/nt_value.h b/src/Value.h
similarity index 100%
rename from src/nt_value.h
rename to src/Value.h
diff --git a/src/nt_wiredecoder.cpp b/src/WireDecoder.cpp
similarity index 98%
rename from src/nt_wiredecoder.cpp
rename to src/WireDecoder.cpp
index fc674b2075..0f9baf7365 100644
--- a/src/nt_wiredecoder.cpp
+++ b/src/WireDecoder.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_wiredecoder.h"
+#include "WireDecoder.h"
 
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
 
-#include "nt_internal.h"
-#include "nt_leb128.h"
+#include "internal.h"
+#include "leb128.h"
 
 using namespace ntimpl;
 
diff --git a/src/nt_wiredecoder.h b/src/WireDecoder.h
similarity index 97%
rename from src/nt_wiredecoder.h
rename to src/WireDecoder.h
index 7201454c64..621afd16e8 100644
--- a/src/nt_wiredecoder.h
+++ b/src/WireDecoder.h
@@ -11,8 +11,8 @@
 #include <cstddef>
 
 #include "ntcore.h"
-#include "nt_leb128.h"
-#include "nt_raw_istream.h"
+#include "leb128.h"
+#include "raw_istream.h"
 
 namespace ntimpl {
 
diff --git a/src/nt_wireencoder.cpp b/src/WireEncoder.cpp
similarity index 98%
rename from src/nt_wireencoder.cpp
rename to src/WireEncoder.cpp
index d4b9c2d78a..b0f2abdc1b 100644
--- a/src/nt_wireencoder.cpp
+++ b/src/WireEncoder.cpp
@@ -5,15 +5,15 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_wireencoder.h"
+#include "WireEncoder.h"
 
 #include <cassert>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
 
-#include "nt_internal.h"
-#include "nt_leb128.h"
+#include "internal.h"
+#include "leb128.h"
 
 using namespace ntimpl;
 
diff --git a/src/nt_wireencoder.h b/src/WireEncoder.h
similarity index 100%
rename from src/nt_wireencoder.h
rename to src/WireEncoder.h
diff --git a/src/nt_base64.cpp b/src/base64.cpp
similarity index 99%
rename from src/nt_base64.cpp
rename to src/base64.cpp
index 724f259342..7fb8a3b968 100644
--- a/src/nt_base64.cpp
+++ b/src/base64.cpp
@@ -62,7 +62,7 @@
  *
  */
 
-#include "nt_base64.h"
+#include "base64.h"
 
 namespace ntimpl {
 
diff --git a/src/nt_base64.h b/src/base64.h
similarity index 100%
rename from src/nt_base64.h
rename to src/base64.h
diff --git a/src/nt_internal.h b/src/internal.h
similarity index 100%
rename from src/nt_internal.h
rename to src/internal.h
diff --git a/src/nt_leb128.cpp b/src/leb128.cpp
similarity index 98%
rename from src/nt_leb128.cpp
rename to src/leb128.cpp
index 20293f7201..4633025c3e 100644
--- a/src/nt_leb128.cpp
+++ b/src/leb128.cpp
@@ -5,9 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_leb128.h"
+#include "leb128.h"
 
-#include "nt_raw_istream.h"
+#include "raw_istream.h"
 
 namespace ntimpl {
 
diff --git a/src/nt_leb128.h b/src/leb128.h
similarity index 100%
rename from src/nt_leb128.h
rename to src/leb128.h
diff --git a/src/nt_persistent.cpp b/src/persistent.cpp
similarity index 98%
rename from src/nt_persistent.cpp
rename to src/persistent.cpp
index 22588ae9af..4087a505d2 100644
--- a/src/nt_persistent.cpp
+++ b/src/persistent.cpp
@@ -10,8 +10,8 @@
 #include <cstdio>
 
 #include "llvm/StringExtras.h"
-#include "nt_base64.h"
-#include "nt_storage.h"
+#include "base64.h"
+#include "Storage.h"
 
 using namespace ntimpl;
 
diff --git a/src/nt_raw_istream.cpp b/src/raw_istream.cpp
similarity index 96%
rename from src/nt_raw_istream.cpp
rename to src/raw_istream.cpp
index 5f818de1f8..9a841b99a1 100644
--- a/src/nt_raw_istream.cpp
+++ b/src/raw_istream.cpp
@@ -5,7 +5,7 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/
 
-#include "nt_raw_istream.h"
+#include "raw_istream.h"
 
 #include <cstring>
 
diff --git a/src/nt_raw_istream.h b/src/raw_istream.h
similarity index 100%
rename from src/nt_raw_istream.h
rename to src/raw_istream.h
diff --git a/src/nt_utility.cpp b/src/utility.cpp
similarity index 100%
rename from src/nt_utility.cpp
rename to src/utility.cpp