--- a/src/main/java/de/intevation/artifacts/httpclient/ConsoleClient.java	Thu Feb 17 10:31:40 2011 +0000
+++ b/src/main/java/de/intevation/artifacts/httpclient/ConsoleClient.java	Thu Feb 17 10:51:37 2011 +0000
@@ -30,8 +30,8 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.PropertyConfigurator;
 
-import de.intevation.artifacts.httpclient.http.GNVClient;
-import de.intevation.artifacts.httpclient.http.GNVClientImpl;
+import de.intevation.artifacts.httpclient.http.HttpClient;
+import de.intevation.artifacts.httpclient.http.HttpClientImpl;
 import de.intevation.artifacts.httpclient.http.response.DocumentResponseHandler;
 
 import de.intevation.artifacts.httpclient.exceptions.ConnectionException;
@@ -121,13 +121,13 @@
 
     public static void main( String[] args )
     {
-        logger.info("Starting GNV console client.");
+        logger.info("Starting console client.");
 
         Configuration conf = readConfiguration();
 
         String serverHost  = (String) conf.getServerSettings("host");
         String serverPort  = (String) conf.getServerSettings("port");
-        GNVClient client   = new GNVClientImpl(serverHost + ":" + serverPort);
+        HttpClient client   = new HttpClientImpl(serverHost + ":" + serverPort);
 
         try {
             Document create = ArtifactProtocolUtils.createCreateDocument(
@@ -201,7 +201,7 @@
                     "IO error while writing the output: " + ioe.getMessage());
             }
 
-            logger.debug("Finished GNV console client.");
+            logger.debug("Finished console client.");
         }
         catch (ConnectionException ce) {
             logger.error(ce.getMessage());
@@ -214,7 +214,7 @@
 
 
     public static void feedAndGo(
-        GNVClient client,
+        HttpClient client,
         Artifact  artifact,
         Map       attr,
         String target)
@@ -237,7 +237,7 @@
      * abstract, so it needs to be reimplemented later, I think.
      */
     public static String[] extractOptions(
-        GNVClient client,
+        HttpClient client,
         Artifact  artifact,
         String    text)
     throws NoSuchOptionException, ConnectionException
@@ -299,7 +299,7 @@
      * describe document.
      */
     public static String[] extractMeasurements(
-        GNVClient client,
+        HttpClient client,
         Artifact  artifact,
         String    text)
     throws NoSuchOptionException, ConnectionException