diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 89a3ae6..68cfc32 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -27,7 +27,7 @@ set (CMAKE_INCLUDE_CURRENT_DIR ON)
 # Instruct CMake to run uic automatically when needed.
 set (CMAKE_AUTOUIC ON)
 
-set (APP_SKIP_BUILD_NUMBER OFF CACHE BOOL "Skip Litt build number increase.")
+set (APP_SKIP_BUILD_NUMBER OFF CACHE BOOL "Skip Noo build number increase.")
 
 # App version is expected as APP_VERSION variable
 #if (NOT APP_VERSION)
@@ -272,7 +272,7 @@ if (TARGET_OSX)
     set_target_properties( ${EXE_NAME} PROPERTIES   MACOSX_BUNDLE_LONG_VERSION_STRING "${APP_VERSION}")
 
     set_target_properties( ${EXE_NAME} PROPERTIES   MACOSX_BUNDLE TRUE
-                                                    MACOSX_BUNDLE_GUI_IDENTIFIER "com.satorilight.litt"
+                                                    MACOSX_BUNDLE_GUI_IDENTIFIER "com.satorilight.noo"
                                                     RESOURCE "${RESOURCE_FILES}")
 endif()
 
diff --git a/client/Info.plist b/client/Info.plist
index da7de3c..0ac46fb 100644
--- a/client/Info.plist
+++ b/client/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Litt</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.Litt</string>
+	<string>com.satorilight.com.noo</string>
 	<key>NOTE</key>
 	<string>This file was generated by Qt/QMake.</string>
 </dict>
diff --git a/client/config.h b/client/config.h
index f88e9c3..22278eb 100644
--- a/client/config.h
+++ b/client/config.h
@@ -2,31 +2,31 @@
 #define __APP_CONFIG_H
 
 // Application name
-#define APPNAME "noo"
+#define APPNAME             "noo"
 
 // Company name
-#define COMPANY "voipobjects.com"
+#define COMPANY             "satorilight.com"
 
 // Default database name
-#define DATABASENAME "database.db"
+#define DATABASENAME        "database.noo"
 
 // Log file name
-#define LOGNAME "noo-log.txt"
+#define LOGNAME             "noo-log.txt"
 
 // About text
-#define ABOUTTEXT "Tiny outliner with time tracking capabilities"
+#define ABOUTTEXT           "Tiny outliner with time tracking capabilities"
 
 // Text for message box with "not implemented" notification
-#define NOTIMPLEMENTEDTEXT "Not implemented in this version"
+#define NOTIMPLEMENTEDTEXT  "Not implemented in this version"
 
 // Settings file name
-#define SETTINGS_FILENAME "noo.ini"
+#define SETTINGS_FILENAME   "noo.ini"
 
 // No password string
-#define NOPASSWORDSTRING ""
+#define NOPASSWORDSTRING    ""
 
 // Mime type of task items
-#define NODE_MIME_TYPE "application/noo-node"
+#define NODE_MIME_TYPE      "application/noo-node"
 
 // Exit code to signal about problems with database
 #define EXITCODE_NO_DATABASE (1)
@@ -39,7 +39,7 @@
 
 #define APP_VERSION_MAJOR 0
 #define APP_VERSION_MINOR 9
-#define APP_VERSION_SUFFIX 4
+#define APP_VERSION_SUFFIX 5
 
 //#ifdef TARGET_OSX
 #define ICONS                   ":/assets/images"
diff --git a/client/fervor/CMakeLists.txt b/client/fervor/CMakeLists.txt
index 0edfac8..6c4acc4 100644
--- a/client/fervor/CMakeLists.txt
+++ b/client/fervor/CMakeLists.txt
@@ -12,7 +12,7 @@ set (QT_USE_QTNETWORK true)
 set (QT_USE_QTWEBKIT true)
 
 set (FERVOR_APP_VERSION "${APP_VERSION}")
-set (FERVOR_APP_NAME "Litt")
+set (FERVOR_APP_NAME "Noo")
 
 # Instruct CMake to run moc automatically when needed.
 set (CMAKE_AUTOMOC ON)
diff --git a/client/mainwindow.ui b/client/mainwindow.ui
index a99f347..5ef10a0 100644
--- a/client/mainwindow.ui
+++ b/client/mainwindow.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string notr="true">Litt</string>
+   <string notr="true">Noo</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <property name="sizePolicy">
@@ -583,10 +583,10 @@
      <normaloff>:/assets/images/buttons/format-justify-fill.png</normaloff>:/assets/images/buttons/format-justify-fill.png</iconset>
    </property>
    <property name="text">
-    <string>Show Litt window</string>
+    <string>Show Noo window</string>
    </property>
    <property name="toolTip">
-    <string>Bring Litt window to foreground</string>
+    <string>Bring Noo window to foreground</string>
    </property>
   </action>
   <action name="mFocusTaskTreeAction">
diff --git a/client/startworkdialog.ui b/client/startworkdialog.ui
index 277011c..b3d9cef 100644
--- a/client/startworkdialog.ui
+++ b/client/startworkdialog.ui
@@ -31,8 +31,8 @@
     </font>
    </property>
    <property name="text">
-    <string>Litt discovered user activity after idle interval. 
-Should Litt start tracking on %TASK%?</string>
+    <string>Noo discovered user activity after idle interval. 
+Should Noo start tracking on %TASK%?</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff --git a/client/stopworkdialog.ui b/client/stopworkdialog.ui
index 1fdaa37..00d2dc7 100644
--- a/client/stopworkdialog.ui
+++ b/client/stopworkdialog.ui
@@ -28,7 +28,7 @@
     </font>
    </property>
    <property name="text">
-    <string>Litt discovered idle interval at %TIME%.
+    <string>Noo discovered idle interval at %TIME%.
 Should app to continue work tracking?</string>
    </property>
    <property name="scaledContents">