diff --git a/libraries/DataFlash/DataFlash.cpp b/libraries/AP_Logger/AP_Logger.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash.cpp
rename to libraries/AP_Logger/AP_Logger.cpp
diff --git a/libraries/DataFlash/DataFlash.h b/libraries/AP_Logger/AP_Logger.h
similarity index 100%
rename from libraries/DataFlash/DataFlash.h
rename to libraries/AP_Logger/AP_Logger.h
diff --git a/libraries/DataFlash/DataFlash_Backend.cpp b/libraries/AP_Logger/AP_Logger_Backend.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash_Backend.cpp
rename to libraries/AP_Logger/AP_Logger_Backend.cpp
diff --git a/libraries/DataFlash/DataFlash_Backend.h b/libraries/AP_Logger/AP_Logger_Backend.h
similarity index 100%
rename from libraries/DataFlash/DataFlash_Backend.h
rename to libraries/AP_Logger/AP_Logger_Backend.h
diff --git a/libraries/DataFlash/DataFlash_File.cpp b/libraries/AP_Logger/AP_Logger_File.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash_File.cpp
rename to libraries/AP_Logger/AP_Logger_File.cpp
diff --git a/libraries/DataFlash/DataFlash_File.h b/libraries/AP_Logger/AP_Logger_File.h
similarity index 100%
rename from libraries/DataFlash/DataFlash_File.h
rename to libraries/AP_Logger/AP_Logger_File.h
diff --git a/libraries/DataFlash/DataFlash_File_sd.cpp b/libraries/AP_Logger/AP_Logger_File_sd.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash_File_sd.cpp
rename to libraries/AP_Logger/AP_Logger_File_sd.cpp
diff --git a/libraries/DataFlash/DataFlash_File_sd.h b/libraries/AP_Logger/AP_Logger_File_sd.h
similarity index 100%
rename from libraries/DataFlash/DataFlash_File_sd.h
rename to libraries/AP_Logger/AP_Logger_File_sd.h
diff --git a/libraries/DataFlash/DataFlash_MAVLink.cpp b/libraries/AP_Logger/AP_Logger_MAVLink.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash_MAVLink.cpp
rename to libraries/AP_Logger/AP_Logger_MAVLink.cpp
diff --git a/libraries/DataFlash/DataFlash_MAVLink.h b/libraries/AP_Logger/AP_Logger_MAVLink.h
similarity index 100%
rename from libraries/DataFlash/DataFlash_MAVLink.h
rename to libraries/AP_Logger/AP_Logger_MAVLink.h
diff --git a/libraries/DataFlash/DataFlash_MAVLinkLogTransfer.cpp b/libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash_MAVLinkLogTransfer.cpp
rename to libraries/AP_Logger/AP_Logger_MAVLinkLogTransfer.cpp
diff --git a/libraries/DataFlash/DataFlash_Revo.cpp b/libraries/AP_Logger/AP_Logger_Revo.cpp
similarity index 100%
rename from libraries/DataFlash/DataFlash_Revo.cpp
rename to libraries/AP_Logger/AP_Logger_Revo.cpp
diff --git a/libraries/DataFlash/DataFlash_Revo.h b/libraries/AP_Logger/AP_Logger_Revo.h
similarity index 100%
rename from libraries/DataFlash/DataFlash_Revo.h
rename to libraries/AP_Logger/AP_Logger_Revo.h
diff --git a/libraries/DataFlash/LogFile.cpp b/libraries/AP_Logger/LogFile.cpp
similarity index 100%
rename from libraries/DataFlash/LogFile.cpp
rename to libraries/AP_Logger/LogFile.cpp
diff --git a/libraries/DataFlash/LogStructure.h b/libraries/AP_Logger/LogStructure.h
similarity index 100%
rename from libraries/DataFlash/LogStructure.h
rename to libraries/AP_Logger/LogStructure.h
diff --git a/libraries/DataFlash/DFMessageWriter.cpp b/libraries/AP_Logger/LoggerMessageWriter.cpp
similarity index 100%
rename from libraries/DataFlash/DFMessageWriter.cpp
rename to libraries/AP_Logger/LoggerMessageWriter.cpp
diff --git a/libraries/DataFlash/DFMessageWriter.h b/libraries/AP_Logger/LoggerMessageWriter.h
similarity index 100%
rename from libraries/DataFlash/DFMessageWriter.h
rename to libraries/AP_Logger/LoggerMessageWriter.h
diff --git a/libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp b/libraries/AP_Logger/examples/AP_Logger_AllTypes/AP_Logger_AllTypes.cpp
similarity index 100%
rename from libraries/DataFlash/examples/DataFlash_AllTypes/DataFlash_AllTypes.cpp
rename to libraries/AP_Logger/examples/AP_Logger_AllTypes/AP_Logger_AllTypes.cpp
diff --git a/libraries/DataFlash/examples/DataFlash_AllTypes/output.BIN b/libraries/AP_Logger/examples/AP_Logger_AllTypes/output.BIN
similarity index 100%
rename from libraries/DataFlash/examples/DataFlash_AllTypes/output.BIN
rename to libraries/AP_Logger/examples/AP_Logger_AllTypes/output.BIN
diff --git a/libraries/DataFlash/examples/DataFlash_AllTypes/wscript b/libraries/AP_Logger/examples/AP_Logger_AllTypes/wscript
similarity index 100%
rename from libraries/DataFlash/examples/DataFlash_AllTypes/wscript
rename to libraries/AP_Logger/examples/AP_Logger_AllTypes/wscript
diff --git a/libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp b/libraries/AP_Logger/examples/AP_Logger_test/AP_Logger_test.cpp
similarity index 100%
rename from libraries/DataFlash/examples/DataFlash_test/DataFlash_test.cpp
rename to libraries/AP_Logger/examples/AP_Logger_test/AP_Logger_test.cpp
diff --git a/libraries/DataFlash/examples/DataFlash_test/nobuild.txt b/libraries/AP_Logger/examples/AP_Logger_test/nobuild.txt
similarity index 100%
rename from libraries/DataFlash/examples/DataFlash_test/nobuild.txt
rename to libraries/AP_Logger/examples/AP_Logger_test/nobuild.txt
diff --git a/libraries/DataFlash/examples/DataFlash_test/wscript b/libraries/AP_Logger/examples/AP_Logger_test/wscript
similarity index 100%
rename from libraries/DataFlash/examples/DataFlash_test/wscript
rename to libraries/AP_Logger/examples/AP_Logger_test/wscript