--- a/Resources/Configuration.json	Sun Sep 16 09:33:55 2012 +0200
+++ b/Resources/Configuration.json	Sun Sep 16 09:35:31 2012 +0200
@@ -1,10 +1,10 @@
 {
     /**
-     * General configuration of Palanthir
+     * General configuration of Orthanc
      **/
 
     // Path to the directory that holds the database
-    "StorageDirectory" : "PalanthirStorage",
+    "StorageDirectory" : "OrthancStorage",
 
 
 
@@ -48,7 +48,7 @@
     // Whether or not the password protection is enabled
     "AuthenticationEnabled" : false,
 
-    // The list of the registered users. Because Palanthir uses HTTP
+    // The list of the registered users. Because Orthanc uses HTTP
     // Basic Authentication, the passwords are stored as plain text.
     "RegisteredUsers" : {
         "alice" : "alicePassword"
@@ -65,7 +65,7 @@
         // "sample" : [ "SAMPLESCP", "192.168.100.42", 104 ]
     },
 
-    // The list of the known Palanthir peers (currently unused)
-    "PalanthirPeers" : {
+    // The list of the known Orthanc peers (currently unused)
+    "OrthancPeers" : {
     }
 }

--- a/Resources/EmbedResources.py	Sun Sep 16 09:33:55 2012 +0200
+++ b/Resources/EmbedResources.py	Sun Sep 16 09:35:31 2012 +0200
@@ -88,7 +88,7 @@
 
 #include <string>
 
-namespace Palanthir
+namespace Orthanc
 {
   namespace EmbeddedResources
   {
@@ -179,12 +179,12 @@
 
 cpp.write("""
 #include "%s.h"
-#include "%s/Core/PalanthirException.h"
+#include "%s/Core/OrthancException.h"
 
 #include <stdint.h>
 #include <string.h>
 
-namespace Palanthir
+namespace Orthanc
 {
   namespace EmbeddedResources
   {
@@ -218,7 +218,7 @@
 
 cpp.write("""
       default:
-        throw PalanthirException(ErrorCode_ParameterOutOfRange);
+        throw OrthancException(ErrorCode_ParameterOutOfRange);
       }
     }
 
@@ -235,7 +235,7 @@
 
 cpp.write("""
       default:
-        throw PalanthirException(ErrorCode_ParameterOutOfRange);
+        throw OrthancException(ErrorCode_ParameterOutOfRange);
       }
     }
 """)
@@ -260,10 +260,10 @@
         for path in resources[name]['Files']:
             cpp.write('        if (!strcmp(path, "%s"))\n' % path)
             cpp.write('          return resource%dBuffer;\n' % resources[name]['Files'][path]['Index'])
-        cpp.write('        throw PalanthirException("Unknown path in a directory resource");\n\n')
+        cpp.write('        throw OrthancException("Unknown path in a directory resource");\n\n')
 
 cpp.write("""      default:
-        throw PalanthirException(ErrorCode_ParameterOutOfRange);
+        throw OrthancException(ErrorCode_ParameterOutOfRange);
       }
     }
 
@@ -280,10 +280,10 @@
         for path in resources[name]['Files']:
             cpp.write('        if (!strcmp(path, "%s"))\n' % path)
             cpp.write('          return resource%dSize;\n' % resources[name]['Files'][path]['Index'])
-        cpp.write('        throw PalanthirException("Unknown path in a directory resource");\n\n')
+        cpp.write('        throw OrthancException("Unknown path in a directory resource");\n\n')
 
 cpp.write("""      default:
-        throw PalanthirException(ErrorCode_ParameterOutOfRange);
+        throw OrthancException(ErrorCode_ParameterOutOfRange);
       }
     }
 """)

--- a/Resources/Orthanc.doxygen	Sun Sep 16 09:33:55 2012 +0200
+++ b/Resources/Orthanc.doxygen	Sun Sep 16 09:35:31 2012 +0200
@@ -25,7 +25,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = Palanthir
+PROJECT_NAME           = Orthanc
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -610,7 +610,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  =  @CMAKE_SOURCE_DIR@/Core @CMAKE_SOURCE_DIR@/PalanthirServer @CMAKE_SOURCE_DIR@/PalanthirCppClient
+INPUT                  =  @CMAKE_SOURCE_DIR@/Core @CMAKE_SOURCE_DIR@/OrthancServer @CMAKE_SOURCE_DIR@/OrthancCppClient
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -662,7 +662,7 @@
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        = Palanthir::Internals
+EXCLUDE_SYMBOLS        = Orthanc::Internals
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or
 # directories that contain example code fragments that are included (see