--- a/cinst/CMakeLists.txt	Mon Sep 22 12:38:06 2014 +0200
+++ b/cinst/CMakeLists.txt	Mon Sep 22 12:40:06 2014 +0200
@@ -11,92 +11,92 @@
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../common)
 
-set(CINST_SOURCES
+set(trustbridge-certificate-installer_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/windowsstore.c
     ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_linux.c
     ${CMAKE_CURRENT_SOURCE_DIR}/nssstore_win.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/main.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/certificate-installer.c
 )
-add_executable(cinst ${CINST_SOURCES})
+add_executable(trustbridge-certificate-installer ${trustbridge-certificate-installer_SOURCES})
 
 if (WIN32)
    set(WIN_EXTRA_LIBS -lcrypt32 -luserenv -lshell32)
 endif(WIN32)
 
-target_link_libraries(cinst
+target_link_libraries(trustbridge-certificate-installer
    trustbridge_common
    ${PROFILING_LIBS}
    ${POLARSSL_LIBRARIES}
    ${WIN_EXTRA_LIBS})
 
-install(TARGETS cinst DESTINATION bin)
+install(TARGETS trustbridge-certificate-installer DESTINATION bin)
 if (WIN32)
    add_custom_command(
-      TARGET cinst
+      TARGET trustbridge-certificate-installer
       POST_BUILD
-      COMMAND ${CMAKE_STRIP} cinst.exe
+      COMMAND ${CMAKE_STRIP} trustbridge-certificate-installer.exe
    )
    if (NOT RELEASE_BUILD)
       add_custom_command(
-         TARGET cinst
+         TARGET trustbridge-certificate-installer
          POST_BUILD
          COMMAND ${OSSLSIGNCODE_EXECUTABLE} sign -certs ${CMAKE_SOURCE_DIR}/ui/tests/data/codesign/codesigning.pem
          -key ${CMAKE_SOURCE_DIR}/ui/tests/data/codesign/codesigning.key
-         -h sha256 -in ${CMAKE_CURRENT_BINARY_DIR}/cinst.exe
-         -out ${CMAKE_CURRENT_BINARY_DIR}/cinst-signed.exe &&
-         mv ${CMAKE_CURRENT_BINARY_DIR}/cinst-signed.exe ${CMAKE_CURRENT_BINARY_DIR}/cinst.exe
+         -h sha256 -in ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-certificate-installer.exe
+         -out ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-certificate-installer-signed.exe &&
+         mv ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-certificate-installer-signed.exe ${CMAKE_CURRENT_BINARY_DIR}/cinst.exe
          )
     endif()
 else()
    add_custom_command(
-      TARGET cinst
+      TARGET trustbridge-certificate-installer
       POST_BUILD
-      COMMAND strip cinst
+      COMMAND strip trustbridge-certificate-installer
    )
 endif()
 
 # ----------------------------------------------------------------------
-# Mozilla nss store specific certificate installer:
-set(MOZILLA_SOURCES
+# trustbridge-nss-installer nss store specific certificate installer:
+set(trustbridge-nss-installer_SOURCES
  ${CMAKE_CURRENT_SOURCE_DIR}/nss-secitemlist.c
- ${CMAKE_CURRENT_SOURCE_DIR}/mozilla.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/nss-installer.c
  )
 
 if(WIN32 OR NSS_FOUND)
    include_directories(${NSS_INCLUDE_DIRS})
-   add_executable(mozilla ${MOZILLA_SOURCES})
-   target_link_libraries(mozilla
+   add_executable(trustbridge-nss-installer ${trustbridge-nss-installer_SOURCES})
+   target_link_libraries(trustbridge-nss-installer
       trustbridge_common
       ${POLARSSL_LIBRARIES}
       ${NSS_LIBRARIES}
       ${PROFILING_LIBS})
-   set_target_properties(mozilla PROPERTIES COMPILE_FLAGS "-std=c99")
-   install(TARGETS mozilla DESTINATION bin)
+   set_target_properties(trustbridge-nss-installer PROPERTIES COMPILE_FLAGS "-std=c99")
+   install(TARGETS trustbridge-nss-installer DESTINATION bin)
 
    if (WIN32)
       add_custom_command(
-         TARGET mozilla
+         TARGET trustbridge-nss-installer
          POST_BUILD
-         COMMAND ${CMAKE_STRIP} mozilla.exe
+         COMMAND ${CMAKE_STRIP} trustbridge-nss-installer.exe
       )
       if (NOT RELEASE_BUILD)
          add_custom_command(
-            TARGET mozilla
+            TARGET trustbridge-nss-installer
             POST_BUILD
             COMMAND ${OSSLSIGNCODE_EXECUTABLE} sign -certs ${CMAKE_SOURCE_DIR}/ui/tests/data/codesign/codesigning.pem
             -key ${CMAKE_SOURCE_DIR}/ui/tests/data/codesign/codesigning.key
-            -h sha256 -in ${CMAKE_CURRENT_BINARY_DIR}/mozilla.exe
-            -out ${CMAKE_CURRENT_BINARY_DIR}/mozilla-signed.exe &&
-            mv ${CMAKE_CURRENT_BINARY_DIR}/mozilla-signed.exe ${CMAKE_CURRENT_BINARY_DIR}/mozilla.exe
+            -h sha256 -in ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-nss-installer.exe
+            -out ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-nss-installer-signed.exe &&
+            mv ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-nss-installer-signed.exe ${CMAKE_CURRENT_BINARY_DIR}/trustbridge-nss-installer.exe
             )
        endif()
    else()
       add_custom_command(
-         TARGET mozilla
+         TARGET trustbridge-nss-installer
          POST_BUILD
-         COMMAND strip mozilla
+         COMMAND strip trustbridge-nss-installer
       )
    endif()
 else()
-   message(STATUS "WARNING: Could not find nss. Mozilla cert installer will not be build!")
+   message(STATUS "WARNING: Could not find nss. trustbridge-nss-installer cert installer will not be build!")
 endif()