diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 07519b62..d8a0da57 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -55,12 +55,15 @@ endmacro()
 
 macro(upm_doxygen)
   if (DOXYGEN_FOUND)
+    if(NOT DEFINED classname)
+      set (classname ${libname})
+    endif()
     set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND})
     add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
       COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n
-        ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
+        ${CMAKE_BINARY_DIR}/xml/${classname}_8h.xml
         ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i
-        DEPENDS ${CMAKE_BINARY_DIR}/xml/${libname}_8h.xml
+        DEPENDS ${CMAKE_BINARY_DIR}/xml/${classname}_8h.xml
     )
     add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i)
     add_dependencies (${libname}doc_i doc)
diff --git a/src/lcd/CMakeLists.txt b/src/lcd/CMakeLists.txt
index 17d1d28a..d5eea870 100644
--- a/src/lcd/CMakeLists.txt
+++ b/src/lcd/CMakeLists.txt
@@ -1,4 +1,5 @@
 set (libname "i2clcd")
+set (classname "lcd")
 set (libdescription "upm lcd/oled displays")
 set (module_src lcd.cxx lcm1602.cxx jhd1313m1.cxx ssd1308.cxx ssd1327.cxx sainsmartks.cxx)
 set (module_h lcd.h lcm1602.h jhd1313m1.h ssd1308.h ssd1327.h ssd.h sainsmartks.h)