diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9bc4c95..50403d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,10 @@ INCLUDE (MacroOptionalAddSubdirectory)
 INCLUDE (CPackDetectArch)
 
 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") # supress Gcc warnings
+SET (PROJ_LCASE "laview-latex-struct")
 
 # configure a header file for Gettext
-SET (GETTEXT_PACKAGE "laview-latex-struct")
+SET (GETTEXT_PACKAGE "${PROJ_LCASE}")
 ADD_DEFINITIONS (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
 IF (WIN32)
   SET (LOCALEDIR "")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 391ef48..6abb6b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,27 +10,27 @@ FILE (GLOB_RECURSE LAviewSources RELATIVE ${CMAKE_SOURCE_DIR}/src *.vala)
 
 VALA_PRECOMPILE (VALA_C ${LAviewSources}
                  PACKAGES gee-0.8 posix
-                 OPTIONS --thread ${VALA_DEBUG}
+                 OPTIONS --thread ${VALA_DEBUG} --vapi=${CMAKE_BINARY_DIR}/src/${PROJ_LCASE}-${MAJOR}.vapi
                  CUSTOM_VAPIS
-                 GENERATE_VAPI laview-latex-struct-${MAJOR}
-                 GENERATE_HEADER laview-latex-struct-${MAJOR}
+                 GENERATE_VAPI ${PROJ_LCASE}-${MAJOR}_internal
+                 GENERATE_HEADER ${PROJ_LCASE}-${MAJOR}
                 )
 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}")
-ADD_LIBRARY (laview-latex-struct SHARED ${VALA_C} ${PROJECT_SOURCE_DIR}/src/vala_unsupported.c)
-TARGET_LINK_LIBRARIES (laview-latex-struct ${GEE_LIBRARIES})
-SET_TARGET_PROPERTIES (laview-latex-struct PROPERTIES VERSION ${VERSION})
-SET_TARGET_PROPERTIES (laview-latex-struct PROPERTIES SOVERSION ${MAJOR})
+ADD_LIBRARY (${PROJ_LCASE} SHARED ${VALA_C} ${PROJECT_SOURCE_DIR}/src/vala_unsupported.c)
+TARGET_LINK_LIBRARIES (${PROJ_LCASE} ${GEE_LIBRARIES})
+SET_TARGET_PROPERTIES (${PROJ_LCASE} PROPERTIES VERSION ${VERSION})
+SET_TARGET_PROPERTIES (${PROJ_LCASE} PROPERTIES SOVERSION ${MAJOR})
 IF (WIN32)
-  SET_TARGET_PROPERTIES (laview-latex-struct PROPERTIES PREFIX "" IMPORT_PREFIX "" SUFFIX "-${MAJOR}.dll")
+  SET_TARGET_PROPERTIES (${PROJ_LCASE} PROPERTIES PREFIX "" IMPORT_PREFIX "" SUFFIX "-${MAJOR}.dll")
 ENDIF (WIN32)
 
 IF (UNIX)
-  INSTALL (TARGETS laview-latex-struct DESTINATION lib)
+  INSTALL (TARGETS ${PROJ_LCASE} DESTINATION lib)
 ELSEIF (WIN32)
-  INSTALL (TARGETS laview-latex-struct
+  INSTALL (TARGETS ${PROJ_LCASE}
            RUNTIME DESTINATION bin
            LIBRARY DESTINATION lib
            ARCHIVE DESTINATION lib)
 ENDIF (UNIX)
 
-INSTALL (FILES ${CMAKE_BINARY_DIR}/src/laview-latex-struct-${MAJOR}.h DESTINATION include)
+INSTALL (FILES ${CMAKE_BINARY_DIR}/src/${PROJ_LCASE}-${MAJOR}.h DESTINATION include)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6fac8b4..f058ffb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,24 +14,24 @@ FILE (GLOB_RECURSE ParseTestSources RELATIVE ${CMAKE_SOURCE_DIR}/test ParseTest.
 VALA_PRECOMPILE (ParseTest_C ${ParseTestSources}
                  PACKAGES gee-0.8 posix
                  OPTIONS --thread ${VALA_DEBUG}
-                 CUSTOM_VAPIS ${PROJECT_BINARY_DIR}/src/laview-latex-struct-${MAJOR}.vapi
+                 CUSTOM_VAPIS ${PROJECT_BINARY_DIR}/src/${PROJ_LCASE}-${MAJOR}_internal.vapi
                  GENERATE_VAPI
                  GENERATE_HEADER
                 )
 ADD_EXECUTABLE (ParseTest ${ParseTest_C})
-TARGET_LINK_LIBRARIES (ParseTest laview-latex-struct ${GEE_LIBRARIES})
+TARGET_LINK_LIBRARIES (ParseTest ${PROJ_LCASE} ${GEE_LIBRARIES})
 
 # add ltable_test executable
 FILE (GLOB_RECURSE LTableTestSources RELATIVE ${CMAKE_SOURCE_DIR}/test LTableTest.vala)
 VALA_PRECOMPILE (LTableTest_C ${LTableTestSources}
                  PACKAGES gee-0.8 posix
                  OPTIONS --thread ${VALA_DEBUG}
-                 CUSTOM_VAPIS ${PROJECT_BINARY_DIR}/src/laview-latex-struct-${MAJOR}.vapi
+                 CUSTOM_VAPIS ${PROJECT_BINARY_DIR}/src/${PROJ_LCASE}-${MAJOR}_internal.vapi
                  GENERATE_VAPI
                  GENERATE_HEADER
                 )
 ADD_EXECUTABLE (LTableTest ${LTableTest_C})
-TARGET_LINK_LIBRARIES (LTableTest laview-latex-struct ${GEE_LIBRARIES})
+TARGET_LINK_LIBRARIES (LTableTest ${PROJ_LCASE} ${GEE_LIBRARIES})
 
 # parsing test macro
 MACRO (do_parse_test testname table_path etalon_path regexp)