diff --git a/catkin/CMakeLists.txt b/catkin/CMakeLists.txt
index df53f0d..c3bd15e 100644
--- a/catkin/CMakeLists.txt
+++ b/catkin/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(river)
+project(audio_river)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
@@ -9,7 +9,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 find_package(catkin REQUIRED COMPONENTS
   drain
   audio
-  airtaudio
+  audio_orchestra
   ejson
   )
 
@@ -25,7 +25,7 @@ find_package(catkin REQUIRED COMPONENTS
 catkin_package(
   INCLUDE_DIRS ../
   LIBRARIES ${PROJECT_NAME}
-  CATKIN_DEPENDS airtaudio audio drain ejson
+  CATKIN_DEPENDS audio_orchestra audio audio_drain ejson
   DEPENDS system_lib
 )
 
@@ -42,20 +42,20 @@ include_directories(
 
 ## Declare a cpp library
 add_library(${PROJECT_NAME}
-  ../${PROJECT_NAME}/debug.cpp
-  ../${PROJECT_NAME}/river.cpp
-  ../${PROJECT_NAME}/Manager.cpp
-  ../${PROJECT_NAME}/Interface.cpp
-  ../${PROJECT_NAME}/io/Group.cpp
-  ../${PROJECT_NAME}/io/Node.cpp
-  ../${PROJECT_NAME}/io/NodeAirTAudio.cpp
-  ../${PROJECT_NAME}/io/NodePortAudio.cpp
-  ../${PROJECT_NAME}/io/NodeAEC.cpp
-  ../${PROJECT_NAME}/io/NodeMuxer.cpp
-  ../${PROJECT_NAME}/io/Manager.cpp
+  ../audio/river/debug.cpp
+  ../audio/river/river.cpp
+  ../audio/river/Manager.cpp
+  ../audio/river/Interface.cpp
+  ../audio/river/io/Group.cpp
+  ../audio/river/io/Node.cpp
+  ../audio/river/io/NodeOrchestra.cpp
+  ../audio/river/io/NodePortAudio.cpp
+  ../audio/river/io/NodeAEC.cpp
+  ../audio/river/io/NodeMuxer.cpp
+  ../audio/river/io/Manager.cpp
 )
 
-add_definitions(-D__AIRTAUDIO_INFERFACE__)
+add_definitions(-DAUDIO_RIVER_BUILD_ORCHESTRA)
 
 ## Specify libraries to link a library or executable target against
 target_link_libraries(${PROJECT_NAME}
@@ -73,7 +73,7 @@ install(TARGETS ${PROJECT_NAME}
 )
 
 ## Mark cpp header files for installation
-install(DIRECTORY ../${PROJECT_NAME}/
+install(DIRECTORY ../audio/river/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
   FILES_MATCHING PATTERN "*.h"
 )
diff --git a/catkin/package.xml b/catkin/package.xml
index abd521e..d3fd5d4 100644
--- a/catkin/package.xml
+++ b/catkin/package.xml
@@ -5,13 +5,13 @@
   <description>Ewol River Intrerface : Is to multiple acces on different format on Audio IO</description>
   <maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
   <license>Apache-2.0</license>
-  <build_depend>drain</build_depend>
+  <build_depend>audio_drain</build_depend>
   <build_depend>audio</build_depend>
   <build_depend>ejson</build_depend>
-  <build_depend>airtaudio</build_depend>
+  <build_depend>audio_orchestra</build_depend>
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>drain</run_depend>
+  <run_depend>audio_drain</run_depend>
   <run_depend>audio</run_depend>
   <run_depend>ejson</run_depend>
-  <run_depend>airtaudio</run_depend>
+  <run_depend>audio_orchestra</run_depend>
 </package>
diff --git a/test/catkin/CMakeLists.txt b/test/catkin/CMakeLists.txt
index ad52845..735b147 100644
--- a/test/catkin/CMakeLists.txt
+++ b/test/catkin/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(river_test)
+project(audio_river_test)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
@@ -7,7 +7,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
-  river
+  audio_river
   )
 
 ###################################
diff --git a/test/catkin/package.xml b/test/catkin/package.xml
index 57147a0..acb55d2 100644
--- a/test/catkin/package.xml
+++ b/test/catkin/package.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <package>
-  <name>river_test</name>
+  <name>audio_river_test</name>
   <version>0.3.0</version>
   <description>Ewol River test</description>
   <maintainer email="yui.heero@gmail.com">Edouard DUPIN</maintainer>
   <license>Apache-2.0</license>
   <build_depend>gtest</build_depend>
-  <build_depend>river</build_depend>
+  <build_depend>audio_river</build_depend>
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>river</run_depend>
+  <run_depend>audio_river</run_depend>
   <run_depend>gtest</run_depend>
 </package>
diff --git a/test/testPlaybackCallback.h b/test/testPlaybackCallback.h
index 6cd518e..4df5617 100644
--- a/test/testPlaybackCallback.h
+++ b/test/testPlaybackCallback.h
@@ -82,7 +82,7 @@ namespace river_test_playback_callback {
 		"		io:'output',\n"
 		"		map-on:{\n"
 		"			interface:'auto',\n"
-		"			name:'hw:2,0',\n"
+		"			name:'default',\n"
 		"		},\n"
 		"		frequency:0,\n"
 		"		channel-map:['front-left', 'front-right'],\n"