diff --git a/libraries/AP_UAVCAN/AP_Canard_iface.cpp b/libraries/AP_DroneCAN/AP_Canard_iface.cpp
similarity index 100%
rename from libraries/AP_UAVCAN/AP_Canard_iface.cpp
rename to libraries/AP_DroneCAN/AP_Canard_iface.cpp
diff --git a/libraries/AP_UAVCAN/AP_Canard_iface.h b/libraries/AP_DroneCAN/AP_Canard_iface.h
similarity index 100%
rename from libraries/AP_UAVCAN/AP_Canard_iface.h
rename to libraries/AP_DroneCAN/AP_Canard_iface.h
diff --git a/libraries/AP_UAVCAN/AP_UAVCAN.cpp b/libraries/AP_DroneCAN/AP_UAVCAN.cpp
similarity index 100%
rename from libraries/AP_UAVCAN/AP_UAVCAN.cpp
rename to libraries/AP_DroneCAN/AP_UAVCAN.cpp
diff --git a/libraries/AP_UAVCAN/AP_UAVCAN.h b/libraries/AP_DroneCAN/AP_UAVCAN.h
similarity index 100%
rename from libraries/AP_UAVCAN/AP_UAVCAN.h
rename to libraries/AP_DroneCAN/AP_UAVCAN.h
diff --git a/libraries/AP_UAVCAN/AP_UAVCAN_DNA_Server.cpp b/libraries/AP_DroneCAN/AP_UAVCAN_DNA_Server.cpp
similarity index 100%
rename from libraries/AP_UAVCAN/AP_UAVCAN_DNA_Server.cpp
rename to libraries/AP_DroneCAN/AP_UAVCAN_DNA_Server.cpp
diff --git a/libraries/AP_UAVCAN/AP_UAVCAN_DNA_Server.h b/libraries/AP_DroneCAN/AP_UAVCAN_DNA_Server.h
similarity index 100%
rename from libraries/AP_UAVCAN/AP_UAVCAN_DNA_Server.h
rename to libraries/AP_DroneCAN/AP_UAVCAN_DNA_Server.h
diff --git a/libraries/AP_UAVCAN/canard/canard_helpers_user.h b/libraries/AP_DroneCAN/canard/canard_helpers_user.h
similarity index 100%
rename from libraries/AP_UAVCAN/canard/canard_helpers_user.h
rename to libraries/AP_DroneCAN/canard/canard_helpers_user.h
diff --git a/libraries/AP_UAVCAN/dsdl/README.md b/libraries/AP_DroneCAN/dsdl/README.md
similarity index 100%
rename from libraries/AP_UAVCAN/dsdl/README.md
rename to libraries/AP_DroneCAN/dsdl/README.md
diff --git a/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/README.md b/libraries/AP_DroneCAN/examples/UAVCAN_sniffer/README.md
similarity index 100%
rename from libraries/AP_UAVCAN/examples/UAVCAN_sniffer/README.md
rename to libraries/AP_DroneCAN/examples/UAVCAN_sniffer/README.md
diff --git a/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp b/libraries/AP_DroneCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp
similarity index 100%
rename from libraries/AP_UAVCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp
rename to libraries/AP_DroneCAN/examples/UAVCAN_sniffer/UAVCAN_sniffer.cpp
diff --git a/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/nobuild.txt b/libraries/AP_DroneCAN/examples/UAVCAN_sniffer/nobuild.txt
similarity index 100%
rename from libraries/AP_UAVCAN/examples/UAVCAN_sniffer/nobuild.txt
rename to libraries/AP_DroneCAN/examples/UAVCAN_sniffer/nobuild.txt
diff --git a/libraries/AP_UAVCAN/examples/UAVCAN_sniffer/wscript b/libraries/AP_DroneCAN/examples/UAVCAN_sniffer/wscript
similarity index 100%
rename from libraries/AP_UAVCAN/examples/UAVCAN_sniffer/wscript
rename to libraries/AP_DroneCAN/examples/UAVCAN_sniffer/wscript