Case change

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1056 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

17 files changed, 70 insertions, 70 deletions

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java
index 4a46f397..06b7f249 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateApplet.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateApplet.java
@@ -39,7 +39,7 @@ import at.gv.egiz.bku.gui.viewer.FontProvider;
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETCertificateApplet extends BKUApplet {
+public class GetCertificateApplet extends BKUApplet {
 
 	private static final long serialVersionUID = 1L;
 	
@@ -55,7 +55,7 @@ public class GETCertificateApplet extends BKUApplet {
 
 	@Override
 	protected AppletBKUWorker createBKUWorker(BKUApplet applet, BKUGUIFacade gui) {
-		return new GETCertificateBKUWorker(applet, (GetCertificateGUIFacade) gui);
+		return new GetCertificateBKUWorker(applet, (GetCertificateGUIFacade) gui);
 	}
 	
 }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java
index 5b04e28b..adf5fd81 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GETCertificateBKUWorker.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/GetCertificateBKUWorker.java
@@ -31,29 +31,29 @@ import org.slf4j.LoggerFactory;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.GetCertificateGUIFacade;
-import at.gv.egiz.bku.smccstal.GETCertificateRequestHandler;
+import at.gv.egiz.bku.smccstal.GetCertificateRequestHandler;
 import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.QuitRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.ext.GETCertificateRequest;
-import at.gv.egiz.stal.ext.GETCertificateResponse;
+import at.gv.egiz.stal.ext.GetCertificateRequest;
+import at.gv.egiz.stal.ext.GetCertificateResponse;
 
 /**
 *
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETCertificateBKUWorker extends AppletBKUWorker {
+public class GetCertificateBKUWorker extends AppletBKUWorker {
 	
-	private final Logger log = LoggerFactory.getLogger(GETCertificateBKUWorker.class);
+	private final Logger log = LoggerFactory.getLogger(GetCertificateBKUWorker.class);
 
-	  public GETCertificateBKUWorker(BKUApplet applet, GetCertificateGUIFacade gui) {
+	  public GetCertificateBKUWorker(BKUApplet applet, GetCertificateGUIFacade gui) {
 	    super(applet, gui);
 	    removeRequestHandler(InfoboxReadRequest.class);
 	    removeRequestHandler(SignRequest.class);
-	    addRequestHandler(GETCertificateRequest.class, new GETCertificateRequestHandler());
+	    addRequestHandler(GetCertificateRequest.class, new GetCertificateRequestHandler());
 	  }
 
 	  @Override
@@ -63,15 +63,15 @@ public class GETCertificateBKUWorker extends AppletBKUWorker {
 
 	    try {
 
-	      List<STALResponse> responses = handleRequest(Collections.singletonList(new GETCertificateRequest()));
+	      List<STALResponse> responses = handleRequest(Collections.singletonList(new GetCertificateRequest()));
 	      handleRequest(Collections.singletonList(new QuitRequest()));
 	      
 	      if (responses.size() == 1) {
 	        STALResponse response = responses.get(0);
-	        if (response instanceof GETCertificateResponse) {
-	          log.debug("GET certificate dialog terminated.");
+	        if (response instanceof GetCertificateResponse) {
+	          log.debug("Get certificate dialog terminated.");
 	        } else if (response instanceof ErrorResponse) {
-	          log.debug("GET certificate dialog terminated with error.");
+	          log.debug("Get certificate dialog terminated with error.");
 	        } else {
 	          throw new RuntimeException("Invalid STAL response: " + response.getClass().getName());
 	        }
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java
index bfa4d71e..60dd94d3 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/HardwareInfoBKUWorker.java
@@ -31,14 +31,14 @@ import org.slf4j.LoggerFactory;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.GetHardwareInfoGUIFacade;
-import at.gv.egiz.bku.smccstal.GETHardwareInfoRequestHandler;
+import at.gv.egiz.bku.smccstal.GetHardwareInfoRequestHandler;
 import at.gv.egiz.stal.ErrorResponse;
 import at.gv.egiz.stal.InfoboxReadRequest;
 import at.gv.egiz.stal.QuitRequest;
 import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
-import at.gv.egiz.stal.ext.GETHardwareInfoRequest;
-import at.gv.egiz.stal.ext.GETHardwareInfoResponse;
+import at.gv.egiz.stal.ext.GetHardwareInfoRequest;
+import at.gv.egiz.stal.ext.GetHardwareInfoResponse;
 
 /**
 *
@@ -52,7 +52,7 @@ public class HardwareInfoBKUWorker extends AppletBKUWorker {
 	    super(applet, gui);
 	    removeRequestHandler(InfoboxReadRequest.class);
 	    removeRequestHandler(SignRequest.class);
-	    addRequestHandler(GETHardwareInfoRequest.class, new GETHardwareInfoRequestHandler());
+	    addRequestHandler(GetHardwareInfoRequest.class, new GetHardwareInfoRequestHandler());
 	  }
 
 	  @Override
@@ -62,12 +62,12 @@ public class HardwareInfoBKUWorker extends AppletBKUWorker {
 
 	    try {
 
-	      List<STALResponse> responses = handleRequest(Collections.singletonList(new GETHardwareInfoRequest()));
+	      List<STALResponse> responses = handleRequest(Collections.singletonList(new GetHardwareInfoRequest()));
 	      handleRequest(Collections.singletonList(new QuitRequest()));
 	      
 	      if (responses.size() == 1) {
 	        STALResponse response = responses.get(0);
-	        if (response instanceof GETHardwareInfoResponse) {
+	        if (response instanceof GetHardwareInfoResponse) {
 	          log.debug("hardware-info dialog terminated.");
 	        } else if (response instanceof ErrorResponse) {
 	          log.debug("hardware-info dialog terminated with error.");
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java
index e048e877..513aa241 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java
@@ -65,7 +65,7 @@ public class GetCertificateGUI extends CardMgmtGUI implements
 	}
 
 	@Override
-	public void showGETCertificateDialog(final ActionListener certificateListener,
+	public void showGetCertificateDialog(final ActionListener certificateListener,
 			final String showGetQualCert, final String showGetSimCert,
 			final ActionListener cancelListener, final String cancelCmd) {
 		
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java
index b327f385..2b1d6188 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java
@@ -43,7 +43,7 @@ public interface GetCertificateGUIFacade extends BKUGUIFacade {
 	 public static final String FILENAME_SIM_CERT =  "simple.cer";
 	 
 	
-	public void showGETCertificateDialog(ActionListener certificateListener, String showGetQualCert, 
+	public void showGetCertificateDialog(ActionListener certificateListener, String showGetQualCert, 
 			String showGetSimCert, ActionListener cancelListener, String cancelCmd);
 	
 	public File showSaveDialog(String defaultfilename);
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
index 7947c117..a7d930b3 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalBKUWorker.java
@@ -26,8 +26,8 @@ package at.gv.egiz.bku.local.stal;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.smccstal.AbstractBKUWorker;
-import at.gv.egiz.bku.smccstal.GETCertificateRequestHandler;
-import at.gv.egiz.bku.smccstal.GETHardwareInfoRequestHandler;
+import at.gv.egiz.bku.smccstal.GetCertificateRequestHandler;
+import at.gv.egiz.bku.smccstal.GetHardwareInfoRequestHandler;
 import at.gv.egiz.bku.smccstal.PINManagementRequestHandler;
 import at.gv.egiz.bku.smccstal.IdentityLinkRequestHandler;
 import at.gv.egiz.stal.QuitRequest;
@@ -36,8 +36,8 @@ import at.gv.egiz.stal.STALResponse;
 import at.gv.egiz.stal.SignRequest;
 
 import at.gv.egiz.stal.ext.IdentityLinkRequest;
-import at.gv.egiz.stal.ext.GETCertificateRequest;
-import at.gv.egiz.stal.ext.GETHardwareInfoRequest;
+import at.gv.egiz.stal.ext.GetCertificateRequest;
+import at.gv.egiz.stal.ext.GetHardwareInfoRequest;
 import at.gv.egiz.stal.ext.PINManagementRequest;
 import java.util.List;
 import javax.swing.JFrame;
@@ -57,8 +57,8 @@ public class LocalBKUWorker extends AbstractBKUWorker {
             new LocalSignRequestHandler(new LocalSecureViewer(gui)));
     addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler());
     addRequestHandler(IdentityLinkRequest.class, new IdentityLinkRequestHandler());
-    addRequestHandler(GETCertificateRequest.class, new GETCertificateRequestHandler());
-    addRequestHandler(GETHardwareInfoRequest.class, new GETHardwareInfoRequestHandler());
+    addRequestHandler(GetCertificateRequest.class, new GetCertificateRequestHandler());
+    addRequestHandler(GetHardwareInfoRequest.class, new GetHardwareInfoRequestHandler());
   }
 
   /** does not change container's visibility (use quit request to close) */
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java
index 50c6c632..56d6e251 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGETCertificateSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalGetCertificateSTALFactory.java
@@ -50,9 +50,9 @@ import org.slf4j.LoggerFactory;
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class LocalGETCertificateSTALFactory implements STALFactory {
+public class LocalGetCertificateSTALFactory implements STALFactory {
 
-	  private final Logger log = LoggerFactory.getLogger(LocalGETCertificateSTALFactory.class);
+	  private final Logger log = LoggerFactory.getLogger(LocalGetCertificateSTALFactory.class);
 	  protected static final Dimension PREFERRED_SIZE = new Dimension(318, 200);
 	  protected URL helpURL;
 	  protected Locale locale;
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java
index d23937f9..23c08bd5 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GETCertificateServlet.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetCertificateServlet.java
@@ -37,27 +37,27 @@ import javax.servlet.http.HttpServletResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.gv.egiz.bku.local.stal.LocalGETCertificateSTALFactory;
+import at.gv.egiz.bku.local.stal.LocalGetCertificateSTALFactory;
 import at.gv.egiz.stal.QuitRequest;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.GETCertificateRequest;
+import at.gv.egiz.stal.ext.GetCertificateRequest;
 
 /**
 *
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETCertificateServlet extends HttpServlet {
+public class GetCertificateServlet extends HttpServlet {
 	private static final long serialVersionUID = 1L;
 	
-	 private final Logger log = LoggerFactory.getLogger(GETCertificateServlet.class);
+	 private final Logger log = LoggerFactory.getLogger(GetCertificateServlet.class);
 
-	LocalGETCertificateSTALFactory stalFactory;
+	LocalGetCertificateSTALFactory stalFactory;
 	  
-	public GETCertificateServlet() {
-	    log.debug("Constuctor: " + GETCertificateServlet.class);
-	   stalFactory = new LocalGETCertificateSTALFactory();
+	public GetCertificateServlet() {
+	    log.debug("Constuctor: " + GetCertificateServlet.class);
+	   stalFactory = new LocalGetCertificateSTALFactory();
 	   try {
 	     stalFactory.setHelpURL("http://localhost:3495/help/");
 	   } catch (MalformedURLException e) {
@@ -77,7 +77,7 @@ public class GETCertificateServlet extends HttpServlet {
 		  
 		STAL getCerTificateSTAL = stalFactory.createSTAL();
 	    
-	    List<STALResponse> stalResps = getCerTificateSTAL.handleRequest(Collections.singletonList(new GETCertificateRequest()));
+	    List<STALResponse> stalResps = getCerTificateSTAL.handleRequest(Collections.singletonList(new GetCertificateRequest()));
 
 	    log.debug("Received STAL reponse {}.", stalResps.get(0).getClass());
 	    
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java
index dc7762a8..51ed2d8d 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/GetHardwareInfoServlet.java
@@ -41,7 +41,7 @@ import at.gv.egiz.bku.local.stal.LocalGetHardwareInfoSTALFactory;
 import at.gv.egiz.stal.QuitRequest;
 import at.gv.egiz.stal.STAL;
 import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.GETHardwareInfoRequest;
+import at.gv.egiz.stal.ext.GetHardwareInfoRequest;
 
 /**
 *
@@ -56,7 +56,7 @@ public class GetHardwareInfoServlet extends HttpServlet {
 	LocalGetHardwareInfoSTALFactory stalFactory;
 	  
 	public GetHardwareInfoServlet() {
-	    log.debug("Constuctor: " + GetHardwareInfoServlet.class);
+	   log.debug("Constructor: " + GetHardwareInfoServlet.class);
 	   stalFactory = new LocalGetHardwareInfoSTALFactory();
 	   try {
 	     stalFactory.setHelpURL("http://localhost:3495/help/");
@@ -77,7 +77,7 @@ public class GetHardwareInfoServlet extends HttpServlet {
 		  
 		STAL getHardwareInfoSTAL = stalFactory.createSTAL();
 	    
-	    List<STALResponse> stalResps = getHardwareInfoSTAL.handleRequest(Collections.singletonList(new GETHardwareInfoRequest()));
+	    List<STALResponse> stalResps = getHardwareInfoSTAL.handleRequest(Collections.singletonList(new GetHardwareInfoRequest()));
 
 	    log.debug("Received STAL reponse {}.", stalResps.get(0).getClass());
 	    
diff --git a/BKULocal/src/main/webapp/WEB-INF/web.xml b/BKULocal/src/main/webapp/WEB-INF/web.xml
index 41d5ab37..136905b6 100644
--- a/BKULocal/src/main/webapp/WEB-INF/web.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/web.xml
@@ -52,11 +52,11 @@
         <servlet-class>at.gv.egiz.bku.local.webapp.IdentityLinkServlet</servlet-class>
     </servlet>
     <servlet>
-        <servlet-name>GETCertificateServlet</servlet-name>
-        <servlet-class>at.gv.egiz.bku.local.webapp.GETCertificateServlet</servlet-class>
+        <servlet-name>GetCertificateServlet</servlet-name>
+        <servlet-class>at.gv.egiz.bku.local.webapp.GetCertificateServlet</servlet-class>
     </servlet>
     <servlet>
-        <servlet-name>GETHardwareInfoServlet</servlet-name>
+        <servlet-name>GetHardwareInfoServlet</servlet-name>
         <servlet-class>at.gv.egiz.bku.local.webapp.GetHardwareInfoServlet</servlet-class>
     </servlet>
     <servlet-mapping>
@@ -77,12 +77,12 @@
         <url-pattern>/IdentityLink</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>GETCertificateServlet</servlet-name>
-        <url-pattern>/GETCertificate</url-pattern>
+        <servlet-name>GetCertificateServlet</servlet-name>
+        <url-pattern>/GetCertificate</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>GETHardwareInfoServlet</servlet-name>
-        <url-pattern>/GETHardwareinfo</url-pattern>
+        <servlet-name>GetHardwareInfoServlet</servlet-name>
+        <url-pattern>/GetHardwareinfo</url-pattern>
     </servlet-mapping>
     <welcome-file-list>
     <welcome-file>index.html</welcome-file>
diff --git a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
index 4cf5ed1f..74b06b72 100644
--- a/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
+++ b/BKUWebStart/src/main/java/at/gv/egiz/bku/webstart/Launcher.java
@@ -83,8 +83,8 @@ public class Launcher implements BKUControllerInterface {
 			http = new URL("http://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3495).intValue() + '/');
 			https = new URL("https://localhost:" + Integer.getInteger(Container.HTTPS_PORT_PROPERTY, 3496).intValue() + '/');
 			pin = new URL(http, "/PINManagement");
-			getcertificate = new URL(http, "/GETCertificate");
-			hardwareinfo = new URL(http, "/GETHardwareinfo");
+			getcertificate = new URL(http, "/GetCertificate");
+			hardwareinfo = new URL(http, "/GetHardwareinfo");
 			cert = new URL(http, "/ca.crt");
 			help = new URL(http, "/help/");
 			ident = new URL(http, "/IdentityLink");
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java
index 7d488170..747564e3 100644
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateRequest.java
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateRequest.java
@@ -30,6 +30,6 @@ import at.gv.egiz.stal.STALRequest;
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETCertificateRequest extends STALRequest {
+public class GetCertificateRequest extends STALRequest {
 
 }
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java
index bb95cc5b..a19be9d3 100644
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETCertificateResponse.java
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetCertificateResponse.java
@@ -30,6 +30,6 @@ import at.gv.egiz.stal.STALResponse;
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETCertificateResponse extends STALResponse {
+public class GetCertificateResponse extends STALResponse {
 
 }
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoRequest.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java
index e4204a9e..728aa4f1 100644
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoRequest.java
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoRequest.java
@@ -30,6 +30,6 @@ import at.gv.egiz.stal.STALRequest;
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETHardwareInfoRequest extends STALRequest {
+public class GetHardwareInfoRequest extends STALRequest {
 
 }
diff --git a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoResponse.java b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java
index cbe5c965..53952618 100644
--- a/STALExt/src/main/java/at/gv/egiz/stal/ext/GETHardwareInfoResponse.java
+++ b/STALExt/src/main/java/at/gv/egiz/stal/ext/GetHardwareInfoResponse.java
@@ -30,6 +30,6 @@ import at.gv.egiz.stal.STALResponse;
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETHardwareInfoResponse extends STALResponse {
+public class GetHardwareInfoResponse extends STALResponse {
 
 }
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETCertificateRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java
index a11f9d16..320fa82f 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETCertificateRequestHandler.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetCertificateRequestHandler.java
@@ -41,12 +41,12 @@ import at.gv.egiz.smcc.SignatureCard;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.GETCertificateRequest;
-import at.gv.egiz.stal.ext.GETCertificateResponse;
+import at.gv.egiz.stal.ext.GetCertificateRequest;
+import at.gv.egiz.stal.ext.GetCertificateResponse;
 
-public class GETCertificateRequestHandler extends AbstractRequestHandler {
+public class GetCertificateRequestHandler extends AbstractRequestHandler {
 
-	private final Logger log = LoggerFactory.getLogger(GETCertificateRequestHandler.class);
+	private final Logger log = LoggerFactory.getLogger(GetCertificateRequestHandler.class);
 	
 	@Override
 	public boolean requireCard() {
@@ -57,13 +57,13 @@ public class GETCertificateRequestHandler extends AbstractRequestHandler {
 	public STALResponse handleRequest(STALRequest request)
 			throws InterruptedException {
 		
-		log.debug("handle a GETCertificateRequest");
+		log.debug("handle a GetCertificateRequest");
 		
-		if (request instanceof GETCertificateRequest) {
+		if (request instanceof GetCertificateRequest) {
 			
 			GetCertificateGUIFacade gui = (GetCertificateGUIFacade) this.gui;
 			
-			gui.showGETCertificateDialog(this, "getqualcert", "getsimcert", this, "cancel");
+			gui.showGetCertificateDialog(this, "getqualcert", "getsimcert", this, "cancel");
 			
 			while (true) {
 			
@@ -73,7 +73,7 @@ public class GETCertificateRequestHandler extends AbstractRequestHandler {
 					
 					 if ("cancel".equals(actionCommand)) {
 				          log.debug("get certificate response cancel.");
-				          return new GETCertificateResponse();
+				          return new GetCertificateResponse();
 				          
 				     } else if ("getqualcert".equals(actionCommand)) {
 				        	
@@ -120,7 +120,7 @@ public class GETCertificateRequestHandler extends AbstractRequestHandler {
 			}
 		}
 		
-		return new GETCertificateResponse();
+		return new GetCertificateResponse();
 	}
 	
 }
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETHardwareInfoRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java
index 4e7fec6c..c3cb7df0 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GETHardwareInfoRequestHandler.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java
@@ -30,17 +30,17 @@ import at.gv.egiz.bku.gui.GetHardwareInfoGUIFacade;
 import at.gv.egiz.smcc.SignatureCardException;
 import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
-import at.gv.egiz.stal.ext.GETHardwareInfoRequest;
-import at.gv.egiz.stal.ext.GETHardwareInfoResponse;
+import at.gv.egiz.stal.ext.GetHardwareInfoRequest;
+import at.gv.egiz.stal.ext.GetHardwareInfoResponse;
 
 /**
 *
 * @author Thomas Lenz <thomas.lenz@iaik.tugraz.at>
 */
 
-public class GETHardwareInfoRequestHandler extends AbstractRequestHandler {
+public class GetHardwareInfoRequestHandler extends AbstractRequestHandler {
 
-	private final Logger log = LoggerFactory.getLogger(GETHardwareInfoRequestHandler.class);
+	private final Logger log = LoggerFactory.getLogger(GetHardwareInfoRequestHandler.class);
 	
 	@Override
 	public boolean requireCard() {
@@ -53,7 +53,7 @@ public class GETHardwareInfoRequestHandler extends AbstractRequestHandler {
 		
 		log.debug("handle a get-hardware info request");
 		
-		if (request instanceof GETHardwareInfoRequest) {
+		if (request instanceof GetHardwareInfoRequest) {
 			
 			GetHardwareInfoGUIFacade gui = (GetHardwareInfoGUIFacade) this.gui;
 			
@@ -69,7 +69,7 @@ public class GETHardwareInfoRequestHandler extends AbstractRequestHandler {
 				
 				 if ("back".equals(actionCommand)) {
 			          log.debug("show hardware info response back.");
-			          return new GETHardwareInfoResponse();
+			          return new GetHardwareInfoResponse();
 			          
 				 } else {
 					 log.info("unknown command resolved.");
@@ -77,7 +77,7 @@ public class GETHardwareInfoRequestHandler extends AbstractRequestHandler {
 			}
 					
 		}
-		return new GETHardwareInfoResponse();
+		return new GetHardwareInfoResponse();
 	}
 	
 	  private static String toString(byte[] b) {