--- a/ui/CMakeLists.txt	Tue Apr 29 09:26:24 2014 +0000
+++ b/ui/CMakeLists.txt	Tue Apr 29 09:33:22 2014 +0000
@@ -12,7 +12,7 @@
 
 find_package(Qt5LinguistTools)
 
-# Common code is used in either the client or the administrat
+# Common code is used in either the client or the administrator
 # application or in unit tests.
 set(UICOMMON_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/certificatelist.cpp
@@ -126,7 +126,7 @@
    qt5_add_resources(ADMINISTRATOR_L10N ${CMAKE_CURRENT_BINARY_DIR}/administrator.qrc)
    qt5_create_translation(ADMINISTRATOR_TRANSLATION ${ADMINSTRATOR_SOURCES_WITH_RESOURCES}
       ${CMAKE_CURRENT_SOURCE_DIR}/l10n/administrator_de_DE.ts)
-   add_executable(administrator
+   add_executable(trustbridge-admin
       ${_add_executable_params}
       ${ADMINSTRATOR_SOURCES_WITH_RESOURCES}
       ${ADMINISTRATOR_L10N}
@@ -146,7 +146,7 @@
 
 else()
    message (STATUS "WARNING: Could not find qt linguist tools. Translation will not be included.")
-   add_executable(administrator
+   add_executable(trustbridge-admin
       ${_add_executable_params}
       ${ADMINSTRATOR_SOURCES_WITH_RESOURCES})
    add_executable(trustbridge
@@ -156,7 +156,7 @@
 
 add_library(ui_common STATIC ${UICOMMON_SOURCES})
 
-target_link_libraries(administrator Qt5::Widgets
+target_link_libraries(trustbridge-admin Qt5::Widgets
    ui_common
    trustbridge_common
    ${POLARSSL_LIBRARIES}
@@ -175,4 +175,4 @@
 add_subdirectory(tests)
 
 install(TARGETS trustbridge DESTINATION bin)
-install(TARGETS administrator DESTINATION bin)
+install(TARGETS trustbridge-admin DESTINATION bin)