diff --git a/MRClient/arangoirb.cpp b/MRClient/arangoirb.cpp
index ebdeb736ef..1d9201c60b 100644
--- a/MRClient/arangoirb.cpp
+++ b/MRClient/arangoirb.cpp
@@ -344,7 +344,7 @@ static void RunShell (mrb_state* mrb) {
   console->open(! NoAutoComplete);
 
   while (true) {
-    char* input = console->prompt("avocirb> ");
+    char* input = console->prompt("arangoirb> ");
 
     if (input == 0) {
       break;
@@ -436,7 +436,7 @@ int main (int argc, char* argv[]) {
   }
 
   printf("\n");
-  printf("Welcome to avocirb %s. Copyright (c) 2012 triAGENS GmbH.\n", TRIAGENS_VERSION);
+  printf("Welcome to arangoirb %s. Copyright (c) 2012 triAGENS GmbH.\n", TRIAGENS_VERSION);
 
 #ifdef TRI_V8_VERSION
   printf("Using MRUBY %s engine. Copyright (c) 2012 mruby developers.\n", TRI_MRUBY_VERSION);
diff --git a/RestServer/ArangoServer.cpp b/RestServer/ArangoServer.cpp
index 0e190691f4..b774a36be7 100644
--- a/RestServer/ArangoServer.cpp
+++ b/RestServer/ArangoServer.cpp
@@ -858,7 +858,7 @@ int ArangoServer::executeShell (bool tests) {
       while(! v8::V8::IdleNotification()) {
       }
 
-      char* input = console->prompt("arango> ");
+      char* input = console->prompt("arangod> ");
 
       if (input == 0) {
         printf("<ctrl-D>\nBye Bye! Auf Wiedersehen! さようなら\n");
diff --git a/V8Client/arangosh.cpp b/V8Client/arangosh.cpp
index 5f702acd60..d2019a42c0 100644
--- a/V8Client/arangosh.cpp
+++ b/V8Client/arangosh.cpp
@@ -928,7 +928,7 @@ static void RunShell (v8::Handle<v8::Context> context) {
   v8::Context::Scope contextScope(context);
   v8::Local<v8::String> name(v8::String::New("(shell)"));
 
-  V8LineEditor* console = new V8LineEditor(context, ".avocsh");
+  V8LineEditor* console = new V8LineEditor(context, ".arangosh");
 
   console->open(!noAutoComplete);
 
@@ -936,7 +936,7 @@ static void RunShell (v8::Handle<v8::Context> context) {
     while (! v8::V8::IdleNotification()) {
     }
 
-    char* input = console->prompt("avocsh> ");
+    char* input = console->prompt("arangosh> ");
 
     if (input == 0) {
       break;
@@ -999,7 +999,7 @@ static bool RunUnitTests (v8::Handle<v8::Context> context) {
 
   // run tests
   char const* input = "require(\"jsunity\").runCommandLineTests();";
-  v8::Local<v8::String> name(v8::String::New("(avocsh)"));
+  v8::Local<v8::String> name(v8::String::New("(arangosh)"));
   TRI_ExecuteStringVocBase(context, v8::String::New(input), name, true);
       
   if (tryCatch.HasCaught()) {
@@ -1247,7 +1247,7 @@ int main (int argc, char* argv[]) {
   }
 
   printf("\n");
-  printf("Welcome to avocsh %s. Copyright (c) 2012 triAGENS GmbH.\n", TRIAGENS_VERSION);
+  printf("Welcome to arangosh %s. Copyright (c) 2012 triAGENS GmbH.\n", TRIAGENS_VERSION);
 
 #ifdef TRI_V8_VERSION
   printf("Using Google V8 %s JavaScript engine.\n", TRI_V8_VERSION);