diff --git a/DSView/DSLogic.qrc b/DSView/DSView.qrc
similarity index 100%
rename from DSView/DSLogic.qrc
rename to DSView/DSView.qrc
diff --git a/DSView/icons/Thumbs.db b/DSView/icons/Thumbs.db
deleted file mode 100644
index 8ea51172..00000000
Binary files a/DSView/icons/Thumbs.db and /dev/null differ
diff --git a/DSView/pv/prop/binding/deviceoptions.cpp b/DSView/pv/prop/binding/binding_deviceoptions.cpp
similarity index 100%
rename from DSView/pv/prop/binding/deviceoptions.cpp
rename to DSView/pv/prop/binding/binding_deviceoptions.cpp
diff --git a/libsigrok4DSL/device.c b/libsigrok4DSL/dsdevice.c
similarity index 100%
rename from libsigrok4DSL/device.c
rename to libsigrok4DSL/dsdevice.c
diff --git a/libsigrok4DSL/hardware/DSLogic/Makefile.am b/libsigrok4DSL/hardware/DSL/Makefile.am
similarity index 100%
rename from libsigrok4DSL/hardware/DSLogic/Makefile.am
rename to libsigrok4DSL/hardware/DSL/Makefile.am
diff --git a/libsigrok4DSL/hardware/DSLogic/command.c b/libsigrok4DSL/hardware/DSL/command.c
similarity index 100%
rename from libsigrok4DSL/hardware/DSLogic/command.c
rename to libsigrok4DSL/hardware/DSL/command.c
diff --git a/libsigrok4DSL/hardware/DSLogic/command.h b/libsigrok4DSL/hardware/DSL/command.h
similarity index 100%
rename from libsigrok4DSL/hardware/DSLogic/command.h
rename to libsigrok4DSL/hardware/DSL/command.h
diff --git a/libsigrok4DSL/hardware/DSLogic/dslogic.h b/libsigrok4DSL/hardware/DSL/dsl.h
similarity index 100%
rename from libsigrok4DSL/hardware/DSLogic/dslogic.h
rename to libsigrok4DSL/hardware/DSL/dsl.h
diff --git a/libsigrok4DSL/hardware/DSLogic/dslogic.c b/libsigrok4DSL/hardware/DSL/dslogic.c
similarity index 100%
rename from libsigrok4DSL/hardware/DSLogic/dslogic.c
rename to libsigrok4DSL/hardware/DSL/dslogic.c
diff --git a/libsigrok4DSL/libsigrok4DSLogic.pc.in b/libsigrok4DSL/libsigrok4DSL.pc.in
similarity index 100%
rename from libsigrok4DSL/libsigrok4DSLogic.pc.in
rename to libsigrok4DSL/libsigrok4DSL.pc.in