switch to EAAF-Components 1.1.0-SNAPSHOT

18 files changed, 112 insertions, 103 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml
index 2810f0b3..069684e3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/pom.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml
@@ -158,6 +158,15 @@
 	</dependencies>
 	
 	<build>
+      <resources>
+         <resource>
+          <directory>src/main/resources</directory>
+         </resource>
+         <resource>
+          <directory>target/generated/cxf</directory>
+         </resource>
+      </resources>
+  
 		<plugins>
 		 	<plugin>
         		<groupId>org.apache.maven.plugins</groupId>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java
index 5362431f..79515032 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 
 public class Constants {
  	
@@ -129,7 +129,7 @@ public class Constants {
 		});
 	 
 	 public static final String POLICY_DEFAULT_ALLOWED_TARGETS = 
-				EAAFConstants.URN_PREFIX_CDID.replaceAll("\\.", "\\\\.").replaceAll("\\+", "\\\\+") + ".*";
+				EaafConstants.URN_PREFIX_CDID.replaceAll("\\.", "\\\\.").replaceAll("\\+", "\\\\+") + ".*";
 	 
 	 //SAML2 Constants
 	 public static final String SUCCESS_URI = "urn:oasis:names:tc:SAML:2.0:status:Success";
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java
index 113fc3e7..0f4a3710 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java
@@ -42,7 +42,7 @@ import com.google.common.collect.ImmutableSortedSet;
 
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
 import eu.eidas.auth.commons.EidasParameterKeys;
 import eu.eidas.auth.commons.light.ILightResponse;
@@ -74,7 +74,7 @@ public class eIDASSignalServlet extends AbstractProcessEngineSignalController {
 							  Constants.eIDAS_HTTP_ENDPOINT_SP_REDIRECT
 							}, 
 					method = {RequestMethod.POST, RequestMethod.GET})
-	public void restoreEidasAuthProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EAAFException {
+	public void restoreEidasAuthProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EaafException {
 		signalProcessManagement(req, resp);
 	}
 	
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAuthenticationException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAuthenticationException.java
index 41da9b1c..e468fd72 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAuthenticationException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAuthenticationException.java
@@ -22,9 +22,9 @@
  *******************************************************************************/
 package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
 
-import at.gv.egiz.eaaf.core.exceptions.EAAFAuthenticationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafAuthenticationException;
 
-public class eIDASAuthenticationException extends EAAFAuthenticationException{
+public class eIDASAuthenticationException extends EaafAuthenticationException{
 
 	/**
 	 * 
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java
index 34b3017f..01f7c1fa 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java
@@ -43,7 +43,7 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponse
 import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.impl.data.Trible;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import eu.eidas.auth.commons.attribute.AttributeDefinition;
@@ -288,7 +288,7 @@ public abstract class AbstracteIDProcessor implements INationaleIDProcessor {
     }
 	
 	private void buildProviderNameAttribute(IRequest pendingReq, Builder authnRequestBuilder) {
-		ISPConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
+		ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
 		
 		//set correct SPType for requested target sector				
 		String publicSectorTargetSelector = basicConfig.getBasicConfiguration(
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
index 6e934c59..a093800e 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Service;
 
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import eu.eidas.auth.commons.attribute.AttributeRegistries;
@@ -59,7 +59,7 @@ public class eIDASAttributeRegistry {
 		try {
 			if (eidasAttributesFile.isEmpty()) {
 				log.error("Basic eIDAS addribute definition NOT defined");
-				throw new EAAFConfigurationException("config.30", 
+				throw new EaafConfigurationException("config.30", 
 						new Object[] {"eidas-attributes.xml"});
 			
 			}
@@ -136,7 +136,7 @@ public class eIDASAttributeRegistry {
 		Map<String, Boolean> result = new HashMap<String, Boolean>();
 		for (String el: configAttributes.values()) {
 			if (StringUtils.isNotEmpty(el.trim())) {
-				List<String> attrDef = KeyValueUtils.getListOfCSVValues(el.trim());
+				List<String> attrDef = KeyValueUtils.getListOfCsvValues(el.trim());
 				boolean isRequired = false;
 				if (attrDef.size() == 2)
 					isRequired = Boolean.parseBoolean(attrDef.get(1));
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
index 6d7b7fd8..6bffef3b 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
@@ -75,9 +75,9 @@ import org.w3c.dom.Element;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SZRCommunicationException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.LoggingHandler;
-import at.gv.egiz.eaaf.core.api.data.XMLNamespaceConstants;
+import at.gv.egiz.eaaf.core.api.data.XmlNamespaceConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
 import at.gv.egiz.eaaf.core.impl.utils.KeyStoreUtils;
 import szrservices.GetBPK;
@@ -141,10 +141,10 @@ public class SZRClient {
 				log.trace(new String(szrResponse));
 				
 				// ok, we have success
-				Document doc = DOMUtils.parseDocument(
+				Document doc = DomUtils.parseDocument(
 							new ByteArrayInputStream(szrResponse),
 							true, 
-							XMLNamespaceConstants.ALL_SCHEMA_LOCATIONS + " " + Constants.SZR_SCHEMA_LOCATIONS, 
+							XmlNamespaceConstants.ALL_SCHEMA_LOCATIONS + " " + Constants.SZR_SCHEMA_LOCATIONS, 
 							null, null
 						);				
 				String xpathExpression = "//saml:Assertion";				
@@ -153,7 +153,7 @@ public class SZRClient {
 				log.trace("Selecting signed doc " + xpathExpression);
 				Element documentNode = (Element) XPathAPI.selectSingleNode(doc,
 				    xpathExpression, nsNode);
-				log.trace("Signed document: " + DOMUtils.serializeNode(documentNode));
+				log.trace("Signed document: " + DomUtils.serializeNode(documentNode));
 
 				
 				IdentityLinkType idl = new IdentityLinkType();
@@ -323,7 +323,7 @@ public class SZRClient {
 				log.trace("Find keyStore path: " + keyStorePath + " Injecting SSL client certificate ... ");
 				try {
 					KeyStore keyStore = KeyStoreUtils.loadKeyStore(
-							FileUtils.makeAbsoluteURL(keyStorePath, basicConfig.getConfigurationRootDirectory()), 
+							FileUtils.makeAbsoluteUrl(keyStorePath, basicConfig.getConfigurationRootDirectory()), 
 							keyStorePassword);
 				
 					KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
@@ -350,7 +350,7 @@ public class SZRClient {
 				log.trace("Find trustStore path: " + trustStorePath + " Injecting SSL TrustStore ... ");
 				try {
 					KeyStore trustStore = KeyStoreUtils.loadKeyStore(
-							FileUtils.makeAbsoluteURL(trustStorePath, basicConfig.getConfigurationRootDirectory()), 
+							FileUtils.makeAbsoluteUrl(trustStorePath, basicConfig.getConfigurationRootDirectory()), 
 							trustStorePassword);
 				
 					TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
index 3f27ca64..26dab045 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
@@ -56,19 +56,19 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponse
 import at.gv.e_government.reference.namespace.persondata._20020228.AlternativeNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
-import at.gv.egiz.eaaf.core.api.data.PVPAttributeDefinitions;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.data.PvpAttributeDefinitions;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
-import at.gv.egiz.eaaf.core.impl.idp.auth.builder.BPKBuilder;
+import at.gv.egiz.eaaf.core.impl.idp.auth.builder.BpkBuilder;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
 import eu.eidas.auth.commons.attribute.AttributeDefinition;
 import eu.eidas.auth.commons.attribute.AttributeValue;
@@ -120,7 +120,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 				// create fake IdL
 				// - fetch IdL template from resources
 				InputStream s = CreateIdentityLinkTask.class.getResourceAsStream("/resources/xmldata/fakeIdL_IdL_template.xml");
-				Element idlTemplate = DOMUtils.parseXmlValidating(s);
+				Element idlTemplate = DomUtils.parseXmlValidating(s);
 
 			    identityLink = new SimpleIdentityLinkAssertionParser(idlTemplate).parseIdentityLink();
 
@@ -151,7 +151,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 
 	            identityLink = new SimpleIdentityLinkAssertionParser(idlassertion).parseIdentityLink();
 
-	            Pair<String, String> bPKCalc = new BPKBuilder().generateAreaSpecificPersonIdentifier(
+	            Pair<String, String> bPKCalc = new BpkBuilder().generateAreaSpecificPersonIdentifier(
 	            		identityLink.getIdentificationValue(), 
 	            		identityLink.getIdentificationType(), 
 	            		pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
@@ -237,7 +237,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 					
 				} else {
 					log.debug("Calculating bPK from baseId ... ");
-					Pair<String, String> bPKCalc = new BPKBuilder().generateAreaSpecificPersonIdentifier(
+					Pair<String, String> bPKCalc = new BpkBuilder().generateAreaSpecificPersonIdentifier(
 		            		identityLink.getIdentificationValue(), 
 		            		identityLink.getIdentificationType(), 
 		            		pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
@@ -268,18 +268,18 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 			authProcessData.setForeigner(true);
 			authProcessData.setIdentityLink(identityLink);
 			authProcessData.setGenericDataToSession(
-					PVPAttributeDefinitions.EID_ISSUING_NATION_NAME, 
+					PvpAttributeDefinitions.EID_ISSUING_NATION_NAME, 
 					eIDASResponseUtils.parseEidasPersonalIdentifier((String) simpleAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)).getFirst());
 			
 			//set bPK and bPKType into auth session
 			authProcessData.setGenericDataToSession(
-					PVPAttributeDefinitions.BPK_NAME, 
+					PvpAttributeDefinitions.BPK_NAME, 
 					extendBPKbyPrefix(
 							bPK, 
 							pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier())
 					);
 			authProcessData.setGenericDataToSession(
-					PVPAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME, 
+					PvpAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME, 
 					pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
 
 			
@@ -290,7 +290,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 		} catch (eIDASAttributeException e) {
 			throw new TaskExecutionException(pendingReq, "Minimum required eIDAS attributeset not found.", e);
 						
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			throw new TaskExecutionException(pendingReq, "IdentityLink generation for foreign person FAILED.", e);
 						
 		} catch (Exception e) {
@@ -303,14 +303,14 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
 	private String extendBPKbyPrefix(String bpk, String type) {
 		String bPKType = null;
 		
-		if (type.startsWith(EAAFConstants.URN_PREFIX_WBPK))
-			bPKType = type.substring((EAAFConstants.URN_PREFIX_WBPK).length());
+		if (type.startsWith(EaafConstants.URN_PREFIX_WBPK))
+			bPKType = type.substring((EaafConstants.URN_PREFIX_WBPK).length());
 		
-		else if (type.startsWith(EAAFConstants.URN_PREFIX_CDID)) 
-			bPKType = type.substring((EAAFConstants.URN_PREFIX_CDID).length());
+		else if (type.startsWith(EaafConstants.URN_PREFIX_CDID)) 
+			bPKType = type.substring((EaafConstants.URN_PREFIX_CDID).length());
 		
-		else if (type.startsWith(EAAFConstants.URN_PREFIX_EIDAS)) 
-			bPKType = type.substring((EAAFConstants.URN_PREFIX_EIDAS).length());
+		else if (type.startsWith(EaafConstants.URN_PREFIX_EIDAS)) 
+			bPKType = type.substring((EaafConstants.URN_PREFIX_EIDAS).length());
 		
 
 		if (bPKType != null ) {
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
index a522feb6..7b61ef7e 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
@@ -44,13 +44,13 @@ import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.ICCSpecificEIDProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
-import at.gv.egiz.eaaf.core.api.gui.ISpringMVCGUIFormBuilder;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import eu.eidas.auth.commons.EidasParameterKeys;
@@ -73,7 +73,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 	@Autowired IConfiguration basicConfig;
 	@Autowired ApplicationContext context;
 	@Autowired ITransactionStorage transactionStore; 
-	@Autowired ISpringMVCGUIFormBuilder guiBuilder;
+	@Autowired ISpringMvcGuiFormBuilder guiBuilder;
 	@Autowired ICCSpecificEIDProcessingService ccSpecificProcessing;
 	 
 	@Override
@@ -83,7 +83,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 		
 		try{						
 			//get service-provider configuration
-			ISPConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
+			ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
 
 			// get target, environment and validate citizen countryCode
 			String citizenCountryCode = (String) executionContext.get(MSeIDASNodeConstants.REQ_PARAM_SELECTED_COUNTRY);
@@ -107,7 +107,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 			String issur = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID);
 			if (StringUtils.isEmpty(issur)) {
 				log.error("Found NO 'eIDAS node issuer' in configuration. Authentication NOT possible!");
-				throw new EAAFConfigurationException("config.27", 
+				throw new EaafConfigurationException("config.27", 
 						new Object[] {"Application config containts NO " + Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID });
 				
 			}
@@ -118,7 +118,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 
 				
 			//TODO: update if eIDAS ref. impl. supports exact matching for non-notified LoA schemes
-			String loa = EAAFConstants.EIDAS_LOA_HIGH;
+			String loa = EaafConstants.EIDAS_LOA_HIGH;
 			if (spConfig.getRequiredLoA() != null) {
 				if (spConfig.getRequiredLoA().isEmpty())
 					log.info("No eIDAS LoA requested. Use LoA HIGH as default");
@@ -173,7 +173,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 				
 			if (StringUtils.isEmpty(forwardURL)) {
 				log.warn("NO ForwardURL defined in configuration. Can NOT forward to eIDAS node! Process stops");
-				throw new EAAFConfigurationException("config.08", new Object[] {
+				throw new EaafConfigurationException("config.08", new Object[] {
 						(environment==null)?Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL:Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL+"."+environment 
 					});
 				
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
index 2698d4ea..4dd50f9a 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
@@ -40,7 +40,7 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttrib
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.validator.eIDASResponseValidator;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
@@ -95,7 +95,7 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
 			//update MOA-Session data with received information			
 			log.debug("Store eIDAS response information into pending-request.");				
 			AuthProcessDataWrapper authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
-			authProcessData.setQAALevel(eIDASResponse.getLevelOfAssurance());
+			authProcessData.setQaaLevel(eIDASResponse.getLevelOfAssurance());
 			authProcessData.setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, eIDASResponse);
 			
 			//store MOA-session to database
@@ -103,7 +103,7 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
 			
 			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_VALID);
 		
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
 			throw new TaskExecutionException(pendingReq, "eIDAS Response processing FAILED.", e);
 					
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
index 363eff85..825fe205 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTest.java
@@ -64,13 +64,13 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
 import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
+import at.gv.egiz.eaaf.core.exceptions.EaafParserException;
 import at.gv.egiz.eaaf.core.impl.data.Trible;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import szrservices.GetIdentityLinkEidasResponse;
 import szrservices.IdentityLinkType;
 import szrservices.PersonInfoType;
@@ -95,7 +95,7 @@ public class SZRClientTest {
 	private static final String PUBKEY_EXPONENT = "AQAB";
 	private static final String PUBKEY_MODULUS = "AJZyj/+sdCMDRq9RkvbFcgSTVn/OfS8EUE81ddwP8MNuJ1kd1SWBUJPaQX2JLJHrL54mkOhrkhH2M/zcuOTu8nW9TOEgXGjrRB/0HpiYKpV+VDJViyyc/GacNLxN4Anw4pima6gHYaJIw9hQkL/nuO2hyh8PGJd7rxeFXJmbLy+X";
 	
-	private static final String DUMMY_TARGET = EAAFConstants.URN_PREFIX_CDID + "ZP";
+	private static final String DUMMY_TARGET = EaafConstants.URN_PREFIX_CDID + "ZP";
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -108,7 +108,7 @@ public class SZRClientTest {
 	public SoapServiceRule soap = SoapServiceRule.newInstance();
 		
 	@Test
-	public void getIdentityLinkRawModeValidResponse() throws SZRException_Exception, EAAFParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException {
+	public void getIdentityLinkRawModeValidResponse() throws SZRException_Exception, EaafParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException {
 		setSZRResponseIdentityLink("/data/szr/szr_resp_valid_1.xml", "http://localhost:1234/demoszr");
 		
 		try {
@@ -140,7 +140,7 @@ public class SZRClientTest {
 	}
 	
 	@Test
-	public void getIdentityLinkRawModeErrorTravelerDocExists() throws SZRException_Exception, EAAFParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException, ParserConfigurationException, SAXException {
+	public void getIdentityLinkRawModeErrorTravelerDocExists() throws SZRException_Exception, EaafParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException, JAXBException, ParserConfigurationException, SAXException {
 		setSZRExceptionIdentityLink("/data/szr/szr_resp_error_travelerdocexists.xml", "http://localhost:1234/demoszr");
 		
 		try {
@@ -199,7 +199,7 @@ public class SZRClientTest {
 	
 	private void setSZRExceptionIdentityLink(String responseXmlPath, String serviceURL) throws JAXBException,ParserConfigurationException, SAXException, IOException, SZRException_Exception {
 		final SZR szrServiceMock = soap.mock(SZR.class, serviceURL);	 
-		final Element detailerror = DOMUtils.parseXmlNonValidating(this.getClass().getResourceAsStream(responseXmlPath));				
+		final Element detailerror = DomUtils.parseXmlNonValidating(this.getClass().getResourceAsStream(responseXmlPath));				
 		final javax.xml.namespace.QName qName = new javax.xml.namespace.QName("urn:SZRServices","F455", "p344");
 		final SoapFault fault = new SoapFault("The travel document you sent to insert a person already exists for another person. Either check the document or have the person altered accordingly", qName);
 		fault.setRole("urn:SZRServices");
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java
index db4f2417..a4aa7ca0 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/SZRClientTestProduction.java
@@ -48,10 +48,10 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
 import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
 import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
+import at.gv.egiz.eaaf.core.exceptions.EaafParserException;
 import at.gv.egiz.eaaf.core.impl.data.Trible;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
 import szrservices.IdentityLinkType;
@@ -78,7 +78,7 @@ public class SZRClientTestProduction {
 	private static final String PUBKEY_EXPONENT = "AQAB";
 	private static final String PUBKEY_MODULUS = "AJZyj/+sdCMDRq9RkvbFcgSTVn/OfS8EUE81ddwP8MNuJ1kd1SWBUJPaQX2JLJHrL54mkOhrkhH2M/zcuOTu8nW9TOEgXGjrRB/0HpiYKpV+VDJViyyc/GacNLxN4Anw4pima6gHYaJIw9hQkL/nuO2hyh8PGJd7rxeFXJmbLy+X";
 	
-	private static final String DUMMY_TARGET = EAAFConstants.URN_PREFIX_CDID + "ZP";
+	private static final String DUMMY_TARGET = EaafConstants.URN_PREFIX_CDID + "ZP";
 	
 	@Test
 	public void dummyTest() { 
@@ -108,7 +108,7 @@ public class SZRClientTestProduction {
 //	}
 	
 	@Test
-	public void getIdentityLinkRawMode() throws SZRException_Exception, EAAFParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException {
+	public void getIdentityLinkRawMode() throws SZRException_Exception, EaafParserException, NoSuchProviderException, IOException, InvalidKeyException, eIDASAuthenticationException {
 		log.debug("Starting connecting SZR Gateway");											
 		IdentityLinkType result = szrClient.getIdentityLinkInRawMode(
 									getPersonInfo());
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
index 35d8a760..09af53b7 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingFirstTest.java
@@ -41,9 +41,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import eu.eidas.auth.commons.light.impl.LightRequest;
 import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
@@ -57,7 +57,7 @@ public class eIDASRequestPreProcessingFirstTest {
 	@Autowired private CCSpecificEIDProcessingService preProcessor; 
 
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	private Builder authnRequestBuilder;
 
 	
@@ -72,14 +72,14 @@ public class eIDASRequestPreProcessingFirstTest {
 	public void setUp() {
 			
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 		authnRequestBuilder = LightRequest.builder();
 		authnRequestBuilder.id(UUID.randomUUID().toString());
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
index ababbd04..c6b1c8d3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/eIDASRequestPreProcessingSecondTest.java
@@ -40,9 +40,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import eu.eidas.auth.commons.light.impl.LightRequest;
 import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
@@ -56,7 +56,7 @@ public class eIDASRequestPreProcessingSecondTest {
 	@Autowired private CCSpecificEIDProcessingService preProcessor; 
 
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	private Builder authnRequestBuilder;
 
 	
@@ -71,14 +71,14 @@ public class eIDASRequestPreProcessingSecondTest {
 	public void setUp() {
 			
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 		authnRequestBuilder = LightRequest.builder();
 		authnRequestBuilder.id(UUID.randomUUID().toString());
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
index 1f03a079..d89f7751 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskFirstTest.java
@@ -23,13 +23,13 @@ import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask;
 import at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 import eu.eidas.auth.commons.light.ILightRequest;
@@ -48,7 +48,7 @@ public class GenerateAuthnRequestTaskFirstTest {
 	private MockHttpServletRequest httpReq;
 	private MockHttpServletResponse httpResp;
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -66,14 +66,14 @@ public class GenerateAuthnRequestTaskFirstTest {
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 	
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 	}
 		
@@ -87,10 +87,10 @@ public class GenerateAuthnRequestTaskFirstTest {
 			
 		} catch (TaskExecutionException e) {
 			//forward URL is not set in example config
-			org.springframework.util.Assert.isInstanceOf(EAAFConfigurationException.class, e.getOriginalException(), "Wrong exception");
-			Assert.assertEquals("wrong errorCode", "config.08", ((EAAFException) e.getOriginalException()).getErrorId());
-			Assert.assertEquals("wrong parameter size", 1, ((EAAFException) e.getOriginalException()).getParams().length);
-			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EAAFException) e.getOriginalException()).getParams()[0]);
+			org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class, e.getOriginalException(), "Wrong exception");
+			Assert.assertEquals("wrong errorCode", "config.08", ((EaafException) e.getOriginalException()).getErrorId());
+			Assert.assertEquals("wrong parameter size", 1, ((EaafException) e.getOriginalException()).getParams().length);
+			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EaafException) e.getOriginalException()).getParams()[0]);
 			
 		}
 		
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java
index cf698f72..8eac7d3f 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskSecondTest.java
@@ -24,13 +24,13 @@ import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask;
 import at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 import eu.eidas.auth.commons.light.ILightRequest;
@@ -49,7 +49,7 @@ public class GenerateAuthnRequestTaskSecondTest {
 	private MockHttpServletRequest httpReq;
 	private MockHttpServletResponse httpResp;
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -67,14 +67,14 @@ public class GenerateAuthnRequestTaskSecondTest {
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 	
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 		
 	}
 	
@@ -87,7 +87,7 @@ public class GenerateAuthnRequestTaskSecondTest {
 		} catch (TaskExecutionException e) {			
 			Assert.assertEquals("wrong pendingReqId", pendingReq.getPendingRequestId(), e.getPendingRequestID());
 			org.springframework.util.Assert.isInstanceOf(eIDASAuthenticationException.class, e.getOriginalException(), "Wrong exception");
-			Assert.assertEquals("wrong errorCode", "eidas.03", ((EAAFException) e.getOriginalException()).getErrorId());
+			Assert.assertEquals("wrong errorCode", "eidas.03", ((EaafException) e.getOriginalException()).getErrorId());
 			
 		}
 				
@@ -103,10 +103,10 @@ public class GenerateAuthnRequestTaskSecondTest {
 			
 		} catch (TaskExecutionException e) {
 			//forward URL is not set in example config
-			org.springframework.util.Assert.isInstanceOf(EAAFConfigurationException.class, e.getOriginalException(), "Wrong exception");
-			Assert.assertEquals("wrong errorCode", "config.08", ((EAAFException) e.getOriginalException()).getErrorId());
-			Assert.assertEquals("wrong parameter size", 1, ((EAAFException) e.getOriginalException()).getParams().length);
-			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EAAFException) e.getOriginalException()).getParams()[0]);
+			org.springframework.util.Assert.isInstanceOf(EaafConfigurationException.class, e.getOriginalException(), "Wrong exception");
+			Assert.assertEquals("wrong errorCode", "config.08", ((EaafException) e.getOriginalException()).getErrorId());
+			Assert.assertEquals("wrong parameter size", 1, ((EaafException) e.getOriginalException()).getParams().length);
+			Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EaafException) e.getOriginalException()).getParams()[0]);
 			
 		}
 		
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
index da4be714..429b2aca 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/test/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTaskThirdTest.java
@@ -22,11 +22,11 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask;
 import at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService;
-import at.gv.egiz.eaaf.core.api.data.EAAFConfigConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySPConfiguration;
+import at.gv.egiz.eaaf.core.impl.idp.module.test.DummySpConfiguration;
 import at.gv.egiz.eaaf.core.impl.idp.module.test.TestRequestImpl;
 import at.gv.egiz.eaaf.core.impl.idp.process.ExecutionContextImpl;
 import eu.eidas.auth.commons.light.ILightRequest;
@@ -45,7 +45,7 @@ public class GenerateAuthnRequestTaskThirdTest {
 	private MockHttpServletRequest httpReq;
 	private MockHttpServletResponse httpResp;
 	private TestRequestImpl pendingReq;
-	private DummySPConfiguration oaParam;
+	private DummySpConfiguration oaParam;
 	
 	@BeforeClass
 	public static void classInitializer() throws IOException {
@@ -63,14 +63,14 @@ public class GenerateAuthnRequestTaskThirdTest {
 		RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(httpReq, httpResp));
 	
 		Map<String, String> spConfig = new HashMap<>();
-		spConfig.put(EAAFConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
+		spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
 		spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
-		oaParam = new DummySPConfiguration(spConfig , basicConfig);	
+		oaParam = new DummySpConfiguration(spConfig , basicConfig);	
 				
 		pendingReq = new TestRequestImpl();
 		pendingReq.setSpConfig(oaParam);
 		pendingReq.setPendingReqId(at.gv.egiz.eaaf.core.impl.utils.Random.nextProcessReferenceValue());
-		pendingReq.setAuthURL("http://test.com/");
+		pendingReq.setAuthUrl("http://test.com/");
 
 		
 	}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
index 78015e3c..dafdcf94 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
@@ -18,7 +18,7 @@
 	<import resource="SpringTest-context_basic_test.xml"/>
 			
 	<bean 	id="mvcGUIBuilderImpl" 
-			class="at.asitplus.eidas.specific.connector.gui.SpringMVCGUIFormBuilderImpl"/>
+			class="at.asitplus.eidas.specific.connector.gui.SpringMvcGuiFormBuilderImpl"/>
 
 	<bean 	id="springManagedSpecificConnectorCommunicationService"
 			class="at.asitplus.test.eidas.specific.modules.authmodule_eIDASv2.dummy.DummySpecificCommunicationService" />