diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ea53e1..a8daa6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ endif ()
 # Dependencies
 ###
 
-find_package(LibUSB REQUIRED)
+find_package(libusb REQUIRED)
 
 if (NOT APPLE AND NOT WIN32 AND NOT CMAKE_CROSSCOMPILING)
     find_package(PkgConfig)
@@ -243,7 +243,7 @@ add_subdirectory(src/stlink-gui)
 # Others
 ###
 
-add_subdirectory(debian/pkgconfig)
+add_subdirectory(debian/pkg-config)
 add_subdirectory(include)                                                            ### TODO: Check path
 add_subdirectory(doc/man)
 add_subdirectory(tests)
diff --git a/cmake/modules/Find7Zip.cmake b/cmake/modules/Find7zip.cmake
similarity index 57%
rename from cmake/modules/Find7Zip.cmake
rename to cmake/modules/Find7zip.cmake
index c462f73..0ccd23a 100644
--- a/cmake/modules/Find7Zip.cmake
+++ b/cmake/modules/Find7zip.cmake
@@ -1,3 +1,7 @@
+# Find7zip.cmake
+# Detect 7zip file archiver on Windows systems to extract (zip-)archives
+
+
 find_program(
     ZIP_EXECUTABLE NAMES 7z.exe p7zip
 	  HINTS "C:\\Program Files\\7-Zip\\" "C:\\Program Files (x86)\\7-Zip\\"
diff --git a/cmake/modules/FindLibUSB.cmake b/cmake/modules/Findlibusb.cmake
similarity index 99%
rename from cmake/modules/FindLibUSB.cmake
rename to cmake/modules/Findlibusb.cmake
index b583b84..5b3e80f 100644
--- a/cmake/modules/FindLibUSB.cmake
+++ b/cmake/modules/Findlibusb.cmake
@@ -1,4 +1,4 @@
-# FindLibUSB.cmake
+# Findlibusb.cmake
 # Once done this will define
 #
 #  LIBUSB_FOUND         libusb present on system
@@ -75,7 +75,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND ${CMAKE_BUILD_TYPE} MATCHES "
 
     if (NOT LIBUSB_FOUND OR EXISTS "/etc/debian_version")
         # Preparations for installing libusb library
-        find_package(7Zip REQUIRED)
+        find_package(7zip REQUIRED)
         set(LIBUSB_WIN_VERSION 1.0.23)          # set libusb version
         set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z)
         set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
diff --git a/debian/libstlink-dev.install b/debian/libstlink-dev.install
index 0c3543c..18fd98b 100644
--- a/debian/libstlink-dev.install
+++ b/debian/libstlink-dev.install
@@ -1,5 +1,4 @@
 usr/include/*
 usr/lib/*/lib*.a
-usr/lib/*/pkgconfig/*
+usr/lib/*/pkg-config/*
 usr/lib/*/lib*.so
-
diff --git a/debian/pkgconfig/CMakeLists.txt b/debian/pkg-config/CMakeLists.txt
similarity index 91%
rename from debian/pkgconfig/CMakeLists.txt
rename to debian/pkg-config/CMakeLists.txt
index 02e80cb..a31e27e 100644
--- a/debian/pkgconfig/CMakeLists.txt
+++ b/debian/pkg-config/CMakeLists.txt
@@ -11,5 +11,5 @@ configure_file(
 
 install(
     FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
-    DESTINATION ${STLINK_LIBRARY_PATH}/pkgconfig/
+    DESTINATION ${STLINK_LIBRARY_PATH}/pkg-config/
     )
diff --git a/debian/pkgconfig/pkg-config.pc.cmake b/debian/pkg-config/pkg-config.pc.cmake
similarity index 99%
rename from debian/pkgconfig/pkg-config.pc.cmake
rename to debian/pkg-config/pkg-config.pc.cmake
index 4170bf8..c00eb07 100644
--- a/debian/pkgconfig/pkg-config.pc.cmake
+++ b/debian/pkg-config/pkg-config.pc.cmake
@@ -8,4 +8,3 @@ includedir=${PKG_CONFIG_INCLUDEDIR}
 libdir=${PKG_CONFIG_LIBDIR}
 Libs: ${PKG_CONFIG_LIBS}
 Cflags: ${PKG_CONFIG_CFLAGS}
-
diff --git a/src/stlink-gui/CMakeLists.txt b/src/stlink-gui/CMakeLists.txt
index 64aba11..c51cf56 100644
--- a/src/stlink-gui/CMakeLists.txt
+++ b/src/stlink-gui/CMakeLists.txt
@@ -1,6 +1,6 @@
 if (NOT gtk_FOUND)
     message(STATUS "gtk not found!")
-    return()
+    return()                         # no GTK present => no GUI build
 endif ()
 
 set(GUI_SOURCES gui.c gui.h)