diff --git a/binding/CMakeLists.txt b/binding/CMakeLists.txt
index e732775e92233ac4c4e3906ae0781d4f32005220..7098b8412e9cc024064b370786266081a84432ed 100644
--- a/binding/CMakeLists.txt
+++ b/binding/CMakeLists.txt
@@ -18,10 +18,10 @@
 ###########################################################################
 
 # Add target to project dependency list
-PROJECT_TARGET_ADD(afm-navigation-v2-binding)
+PROJECT_TARGET_ADD(afm-navigationv2-binding)
 
 	# Define project Targets
-	add_library(afm-navigation-v2-binding MODULE navigation-api.c)
+	add_library(afm-navigationv2-binding MODULE navigation-api.c)
 
 	# Binder exposes a unique public entry point
 	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
diff --git a/binding/navigation-api.c b/binding/navigation-api.c
index 97f1f3441b9ee77c37eb524250aac176be40000b..8415c1c76a3fe89986b26162a1c9063c4e688ee8 100644
--- a/binding/navigation-api.c
+++ b/binding/navigation-api.c
@@ -421,7 +421,7 @@ static const afb_verb_t binding_verbs[] = {
  * description of the binding for afb-daemon
  */
 const afb_binding_t afbBindingV3 = {
-	.api = "navigation-v2",
+	.api = "navigationv2",
 	.verbs = binding_verbs,
 	.onevent = onevent,
 	.init = init,
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 95e974230158c894888a148e668c248df6cdefd8..a0ef05178cf4547377e7f6a50b3f92550f313133 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -18,17 +18,17 @@
 
 # Project Info
 # ------------------
-set(PROJECT_NAME agl-service-navigation-v2)
+set(PROJECT_NAME agl-service-navigationv2)
 set(PROJECT_VERSION "1.0")
 set(PROJECT_PRETTY_NAME "Navigation service for AGL")
 set(PROJECT_DESCRIPTION "Navigation reporting proxy for consumers")
-set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/apps/agl-service-navigation")
+set(PROJECT_URL "https://github.com/SebEckl/agl-service-navigation.git")
 set(PROJECT_ICON "icon.png")
 set(PROJECT_AUTHOR "Matt Ranostay - Edited by Sebastian Eckl")
 set(PROJECT_AUTHOR_MAIL "matt.ranostay@konsulko.com")
 set(PROJECT_LICENSE "APL2.0")
 set(PROJECT_LANGUAGES,"C")
-set(API_NAME "navigation-v2")
+set(API_NAME "navigationv2")
 
 # Where the project configuration files are stored
 set(PROJECT_CMAKE_CONF_DIR "conf.d")
@@ -119,7 +119,7 @@ set(WIDGET_TYPE application/vnd.agl.service)
 # This is the file that will be executed, loaded,
 # at launch time by the application framework.
 #
-set(WIDGET_ENTRY_POINT lib/libafm-navigation-v2-binding.so)
+set(WIDGET_ENTRY_POINT lib/libafm-navigationv2-binding.so)
 
 # Print a helper message when every thing is finished
 # ----------------------------------------------------