switch to EAAF-Components 1.1.0-SNAPSHOT

23 files changed, 211 insertions, 211 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringInitializer.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringInitializer.java
index b5f05096..083b668c 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringInitializer.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringInitializer.java
@@ -50,7 +50,7 @@ import at.gv.egiz.components.spring.api.SpringLoader;
 import at.gv.egiz.eaaf.core.api.IStatusMessenger;
 import at.gv.egiz.eaaf.core.impl.logging.LogMessageProviderFactory;
 import at.gv.egiz.eaaf.core.impl.utils.Random;
-import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EAAFDefaultSAML2Bootstrap;
+import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafDefaultSaml2Bootstrap;
 
 /**
  * Web application initializer
@@ -163,7 +163,7 @@ public class SpringInitializer implements WebApplicationInitializer {
 			LogMessageProviderFactory.setStatusMessager(rootContext.getBean(IStatusMessenger.class));
 			
 			log.info("Bootstrap openSAML .... ");
-			EAAFDefaultSAML2Bootstrap.bootstrap();
+			EaafDefaultSaml2Bootstrap.bootstrap();
 
 			log.info("Seed random number generator ... ");
 			Random.seedRandom();
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/auth/AuthenticationManager.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/auth/AuthenticationManager.java
index 2fc807c8..b4944675 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/auth/AuthenticationManager.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/auth/AuthenticationManager.java
@@ -33,8 +33,8 @@ import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.api.idp.slo.ISLOInformationContainer;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.api.idp.slo.ISloInformationContainer;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.AbstractAuthenticationManager;
 import at.gv.egiz.eaaf.core.impl.idp.controller.protocols.RequestImpl;
 
@@ -43,8 +43,8 @@ public class AuthenticationManager extends AbstractAuthenticationManager {
 	private static final Logger log = LoggerFactory.getLogger(AuthenticationManager.class);
 	
 	@Override
-	public ISLOInformationContainer performSingleLogOut(HttpServletRequest httpReq, HttpServletResponse httpResp, 
-			IRequest pendingReq, String internalSSOId) throws EAAFException {		
+	public ISloInformationContainer performSingleLogOut(HttpServletRequest httpReq, HttpServletResponse httpResp, 
+			IRequest pendingReq, String internalSSOId) throws EaafException {		
 		throw new RuntimeException("Single LogOut is NOT supported by this implementation");
 		
 	}
@@ -52,7 +52,7 @@ public class AuthenticationManager extends AbstractAuthenticationManager {
 	@Override
 	protected void populateExecutionContext(ExecutionContext executionContext, 
 			RequestImpl pendingReq, HttpServletRequest httpReq)
-			throws EAAFException {
+			throws EaafException {
 		log.trace("No implementation-specific population of execution-context required ... ");
 		
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
index 07103ff2..0688a13f 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/AuthenticationDataBuilder.java
@@ -34,13 +34,13 @@ import org.w3c.dom.DOMException;
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-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.auth.data.IAuthProcessDataContainer;
-import at.gv.egiz.eaaf.core.exceptions.EAAFAuthenticationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFBuilderException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFParserException;
+import at.gv.egiz.eaaf.core.exceptions.EaafAuthenticationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafBuilderException;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.EaafParserException;
 import at.gv.egiz.eaaf.core.exceptions.XPathException;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.core.impl.idp.AuthenticationData;
@@ -52,7 +52,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 	private static final Logger log = LoggerFactory.getLogger(AuthenticationDataBuilder.class);
 	
 	@Override
-	public IAuthData buildAuthenticationData(IRequest pendingReq) throws EAAFAuthenticationException {
+	public IAuthData buildAuthenticationData(IRequest pendingReq) throws EaafAuthenticationException {
 
 		IAuthProcessDataContainer authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
 		AuthenticationData authData = new AuthenticationData();
@@ -64,10 +64,10 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 			authData.setSsoSessionValidTo(new Date(new Date().getTime() 
 					+ MSeIDASNodeConstants.DEFAULT_PVP_ASSERTION_VALIDITY * 60 * 1000));
 			
-		} catch (EAAFBuilderException | EAAFParserException | EAAFConfigurationException 
+		} catch (EaafBuilderException | EaafParserException | EaafConfigurationException 
 				| XPathException | DOMException e) {
 			log.warn("Can not build authentication data from auth. process information");
-			throw new EAAFAuthenticationException("builder.11", new Object[]{e.getMessage()}, e);
+			throw new EaafAuthenticationException("builder.11", new Object[]{e.getMessage()}, e);
 
 		}
 		 
@@ -76,25 +76,25 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 	}
 
 	@Override
-	protected IAuthData buildDeprecatedAuthData(IRequest arg0) throws EAAFException {
+	protected IAuthData buildDeprecatedAuthData(IRequest arg0) throws EaafException {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	protected void buildServiceSpecificAuthenticationData(IAuthData arg0, IRequest arg1) throws EAAFException {
+	protected void buildServiceSpecificAuthenticationData(IAuthData arg0, IRequest arg1) throws EaafException {
 		// TODO Auto-generated method stub
 		
 	}
 
 	@Override
-	protected IAuthData getAuthDataInstance(IRequest arg0) throws EAAFException {
+	protected IAuthData getAuthDataInstance(IRequest arg0) throws EaafException {
 		return new AuthenticationData();
 		
 	}
 	
 	@Override
-	protected Pair<String, String> buildOAspecificbPK(IRequest pendingReq, AuthenticationData authData) throws EAAFBuilderException {
+	protected Pair<String, String> buildOAspecificbPK(IRequest pendingReq, AuthenticationData authData) throws EaafBuilderException {
 		//TODO: check if bPK already exists
 		
 		
@@ -103,14 +103,14 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 	}
 	
 	@Override
-	protected Pair<String, String> getEncryptedbPKFromPVPAttribute(IAuthProcessDataContainer arg0,
-			AuthenticationData arg1, ISPConfiguration arg2) throws EAAFBuilderException {
+	protected Pair<String, String> getEncryptedBpkFromPvpAttribute(IAuthProcessDataContainer arg0,
+			AuthenticationData arg1, ISpConfiguration arg2) throws EaafBuilderException {
 		return null;
 		
 	}
 
 	@Override
-	protected Pair<String, String> getbaseIDFromSZR(AuthenticationData arg0, String arg1, String arg2) {
+	protected Pair<String, String> getbaseIdFromSzr(AuthenticationData arg0, String arg1, String arg2) {
 		return null;
 		
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/PVPSubjectNameGenerator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/PvpSubjectNameGenerator.java
index 874a1921..bb43ee08 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/PVPSubjectNameGenerator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/builder/PvpSubjectNameGenerator.java
@@ -25,16 +25,16 @@
 package at.asitplus.eidas.specific.connector.builder;
 
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-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.Pair;
-import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2Exception;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 import at.gv.egiz.eaaf.modules.pvp2.idp.api.builder.ISubjectNameIdGenerator;
 
-public class PVPSubjectNameGenerator implements ISubjectNameIdGenerator {
+public class PvpSubjectNameGenerator implements ISubjectNameIdGenerator {
 
 	@Override
-	public Pair<String, String> generateSubjectNameId(IAuthData authData, ISPConfiguration spConfig) throws PVP2Exception {
-		return Pair.newInstance(authData.getBPK(), authData.getBPKType());
+	public Pair<String, String> generateSubjectNameId(IAuthData authData, ISpConfiguration spConfig) throws Pvp2Exception {
+		return Pair.newInstance(authData.getBpk(), authData.getBpkType());
 	}
 
 }
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java
index b044f398..4086ef7e 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java
@@ -35,48 +35,48 @@ import org.springframework.stereotype.Service;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.modules.pvp2.api.IPvp2BasicConfiguration;
 
 @Service("PVPEndPointConfiguration")
-public class PVPEndPointConfiguration implements IPVP2BasicConfiguration {
+public class PVPEndPointConfiguration implements IPvp2BasicConfiguration {
 	private static final Logger log = LoggerFactory.getLogger(PVPEndPointConfiguration.class);
 	
 	@Autowired(required=true) IConfiguration basicConfiguration;
 	
 	@Override
-	public String getIDPEntityId(String authURL) throws EAAFException {
+	public String getIdpEntityId(String authURL) throws EaafException {
 		return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_METADATA;
 		
 	} 
 
 	@Override 
-	public String getIDPSSOPostService(String authURL) throws EAAFException {
+	public String getIdpSsoPostService(String authURL) throws EaafException {
 		return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_POST;
 		
 	}
 
 	@Override
-	public String getIDPSSORedirectService(String authURL) throws EAAFException {
+	public String getIdpSsoRedirectService(String authURL) throws EaafException {
 		return removePostFix(authURL) + MSeIDASNodeConstants.ENDPOINT_PVP_REDIRECT;
 		
 	}
 
 	@Override
-	public Object getIDPSSOSOAPService(String extractAuthURLFromRequest) throws EAAFException {
+	public Object getIdpSsoSoapService(String extractAuthURLFromRequest) throws EaafException {
 		log.warn("PVP S-Profile End-Point does NOT support SOAP Binding");
 		return null;
 		
 	}
 
 	@Override
-	public List<ContactPerson> getIDPContacts() throws EAAFException {
+	public List<ContactPerson> getIdpContacts() throws EaafException {
 		// Return contact person, if it shall be included in metadata
 		return null;
 	}
 
 	@Override
-	public Organization getIDPOrganisation() throws EAAFException {
+	public Organization getIdpOrganisation() throws EaafException {
 		// Return organization, if it shall be included in metadata
 		return null;
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java
index 39e0c1a4..62ca42ac 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPMetadataConfiguration.java
@@ -38,22 +38,22 @@ import org.slf4j.LoggerFactory;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.modules.pvp2.api.IPvp2BasicConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
-import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PVPAttributeBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
-public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguration{
+public class PVPMetadataConfiguration implements IPvpMetadataBuilderConfiguration{
 	private static final Logger log = LoggerFactory.getLogger(PVPMetadataConfiguration.class);
 	
 	private IConfiguration basicConfig;
 	private String authUrl;
 	private AbstractCredentialProvider pvpIDPCredentials;
-	private IPVP2BasicConfiguration pvpBasicConfig;
+	private IPvp2BasicConfiguration pvpBasicConfig;
 	
-	public PVPMetadataConfiguration(IConfiguration basicConfig, String authURL, IPVP2BasicConfiguration pvpBasicConfig, AbstractCredentialProvider pvpIDPCredentials) {
+	public PVPMetadataConfiguration(IConfiguration basicConfig, String authURL, IPvp2BasicConfiguration pvpBasicConfig, AbstractCredentialProvider pvpIDPCredentials) {
 		this.authUrl = authURL;
 		this.pvpIDPCredentials = pvpIDPCredentials;
 		this.basicConfig = basicConfig;
@@ -62,7 +62,7 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	}
 	
 	@Override 
-	public String getSPNameForLogging() {
+	public String getSpNameForLogging() {
 		return "PVP2 S-Profile IDP";
 	}
 
@@ -81,13 +81,13 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	}
 
 	@Override
-	public boolean buildIDPSSODescriptor() {
+	public boolean buildIdpSsoDescriptor() {
 		return true;
 		
 	}
 
 	@Override
-	public boolean buildSPSSODescriptor() {
+	public boolean buildSpSsoDescriptor() {
 		return false;
 		
 	}
@@ -95,9 +95,9 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	@Override
 	public String getEntityID() {
 		try {
-			return pvpBasicConfig.getIDPEntityId(authUrl);
+			return pvpBasicConfig.getIdpEntityId(authUrl);
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.error("Can NOT build PVP metadata configuration.", e);
 			throw new RuntimeException("Can NOT build PVP metadata configuration.");
 			
@@ -114,9 +114,9 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	@Override
 	public List<ContactPerson> getContactPersonInformation() {		
 		try {
-			return pvpBasicConfig.getIDPContacts();
+			return pvpBasicConfig.getIdpContacts();
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.error("Can NOT build PVP metadata configuration.", e);
 			throw new RuntimeException("Can NOT build PVP metadata configuration.");
 			
@@ -127,9 +127,9 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	@Override
 	public Organization getOrgansiationInformation() {
 		try {
-			return pvpBasicConfig.getIDPOrganisation();
+			return pvpBasicConfig.getIdpOrganisation();
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.error("Can NOT build PVP metadata configuration.", e);
 			throw new RuntimeException("Can NOT build PVP metadata configuration.");
 			
@@ -138,13 +138,13 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 
 	@Override
 	public Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException {
-		return pvpIDPCredentials.getIDPMetaDataSigningCredential();
+		return pvpIDPCredentials.getIdpMetaDataSigningCredential();
 		
 	}
 
 	@Override
 	public Credential getRequestorResponseSigningCredentials() throws CredentialsNotAvailableException {
-		return pvpIDPCredentials.getIDPAssertionSigningCredential();
+		return pvpIDPCredentials.getIdpAssertionSigningCredential();
 		
 	}
 
@@ -156,11 +156,11 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	}
 
 	@Override
-	public String getIDPWebSSOPostBindingURL() {
+	public String getIdpWebSsoPostBindingUrl() {
 		try {
-			return pvpBasicConfig.getIDPSSOPostService(authUrl);
+			return pvpBasicConfig.getIdpSsoPostService(authUrl);
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.error("Can NOT build PVP metadata configuration.", e);
 			throw new RuntimeException("Can NOT build PVP metadata configuration.");
 			
@@ -169,11 +169,11 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	}
 
 	@Override
-	public String getIDPWebSSORedirectBindingURL() {
+	public String getIdpWebSsoRedirectBindingUrl() {
 		try {
-			return pvpBasicConfig.getIDPSSORedirectService(authUrl);
+			return pvpBasicConfig.getIdpSsoRedirectService(authUrl);
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.error("Can NOT build PVP metadata configuration.", e);
 			throw new RuntimeException("Can NOT build PVP metadata configuration.");
 			
@@ -181,68 +181,68 @@ public class PVPMetadataConfiguration implements IPVPMetadataBuilderConfiguratio
 	}
 
 	@Override
-	public String getIDPSLOPostBindingURL() {
+	public String getIdpSloPostBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public String getIDPSLORedirectBindingURL() {
+	public String getIdpSloRedirectBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public String getSPAssertionConsumerServicePostBindingURL() {
+	public String getSpAssertionConsumerServicePostBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public String getSPAssertionConsumerServiceRedirectBindingURL() {
+	public String getSpAssertionConsumerServiceRedirectBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public String getSPSLOPostBindingURL() {
+	public String getSpSloPostBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public String getSPSLORedirectBindingURL() {
+	public String getSpSloRedirectBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public String getSPSLOSOAPBindingURL() {
+	public String getSpSloSoapBindingUrl() {
 		return null;
 		
 	}
 
 	@Override
-	public List<Attribute> getIDPPossibleAttributes() {
-		return PVPAttributeBuilder.buildSupportedEmptyAttributes();
+	public List<Attribute> getIdpPossibleAttributes() {
+		return PvpAttributeBuilder.buildSupportedEmptyAttributes();
 		
 	}
 
 	@Override
-	public List<String> getIDPPossibleNameITTypes() {
+	public List<String> getIdpPossibleNameIdTypes() {
 		return Arrays.asList(NameIDType.PERSISTENT, 
 				 NameIDType.TRANSIENT,
 				 NameIDType.UNSPECIFIED);
 	}
 
 	@Override
-	public List<RequestedAttribute> getSPRequiredAttributes() {
+	public List<RequestedAttribute> getSpRequiredAttributes() {
 		return null;
 		
 	}
 
 	@Override
-	public List<String> getSPAllowedNameITTypes() {
+	public List<String> getSpAllowedNameIdTypes() {
 		return null;
 		
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
index 34b9d2fa..97842262 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
@@ -63,7 +63,7 @@ public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
 		String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_STATIC_PATH);
 		try {
 			if (StringUtils.isNotEmpty(staticResources)) {
-				String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory());
+				String absPath = FileUtils.makeAbsoluteUrl(staticResources , basicConfig.getConfigurationRootDirectory());
 				if (!absPath.endsWith("/"))
 					absPath += "/";
 					
@@ -102,7 +102,7 @@ public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
 	    final String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_PROPERTIES_PATH);
 		try {
 			if (StringUtils.isNotEmpty(staticResources)) {
-				final String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory());
+				final String absPath = FileUtils.makeAbsoluteUrl(staticResources , basicConfig.getConfigurationRootDirectory());
 				messageSource.setBasename(absPath);
 								
 			} else
@@ -130,7 +130,7 @@ public class StaticResourceConfiguration extends WebMvcConfigurerAdapter {
 		final String staticResources = basicConfig.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH);
 		try {
 			if (StringUtils.isNotEmpty(staticResources)) {
-				String absPath = FileUtils.makeAbsoluteURL(staticResources , basicConfig.getConfigurationRootDirectory());
+				String absPath = FileUtils.makeAbsoluteUrl(staticResources , basicConfig.getConfigurationRootDirectory());
 				if (!absPath.endsWith("/"))
 					absPath += "/";
 
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
index 0e95c1fc..14095ffc 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
@@ -43,15 +43,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-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.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.Random;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataConfigurationFactory;
-import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PVPMetadataBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataConfigurationFactory;
+import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpMetadataBuilder;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
 @Controller
@@ -70,8 +70,8 @@ public class MonitoringController {
 	@Autowired private ITransactionStorage storage;
 	@Autowired private IConfigurationWithSP config;
 	
-	@Autowired private PVPMetadataBuilder metadatabuilder;
-	@Autowired private IPVPMetadataConfigurationFactory configFactory;	
+	@Autowired private PvpMetadataBuilder metadatabuilder;
+	@Autowired private IPvpMetadataConfigurationFactory configFactory;	
 	private AbstractCredentialProvider pvpIDPCredentials;
 	
 	/**
@@ -86,7 +86,7 @@ public class MonitoringController {
 	@ExceptionHandler({Throwable.class})
 	public void genericExceptionHandler(HttpServletResponse resp, Exception exception) throws IOException {
 		log.error("Monitoring Servlet receives an error." , exception);
-		resp.setContentType(EAAFConstants.CONTENTTYPE_HTML_UTF8);
+		resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
 		resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 		resp.getWriter().write("Reason: " 
 				+ StringEscapeUtils.escapeHtml4(StringEscapeUtils.escapeEcmaScript(exception.getMessage())));
@@ -97,7 +97,7 @@ public class MonitoringController {
 	@RequestMapping(value = {MSeIDASNodeConstants.ENDPOINT_MONITORING_MONITOR}, 
 					method = {RequestMethod.GET} )
 	public void startFullTest(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-		resp.setContentType(EAAFConstants.CONTENTTYPE_HTML_UTF8);
+		resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
 		
 		try {
 			testConfig();
@@ -145,7 +145,7 @@ public class MonitoringController {
 			result += e.getMessage() + "<br>";
 		}
 		
-		resp.setContentType(EAAFConstants.CONTENTTYPE_HTML_UTF8);
+		resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
 		resp.setStatus(HttpServletResponse.SC_OK);
 		resp.getWriter().write(result);
 		
@@ -165,7 +165,7 @@ public class MonitoringController {
 			else
 				log.warn("Montioring: TestValue: " + value + " does NOT match in Storage test");
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.warn("Montioring: Can not read/write to storage.", e);
 			
 		}
@@ -194,11 +194,11 @@ public class MonitoringController {
 	private String testPVPMetadata() throws Exception {
 		try {
 			//build metadata
-			IPVPMetadataBuilderConfiguration metadataConfig = 
+			IPvpMetadataBuilderConfiguration metadataConfig = 
 				configFactory.generateMetadataBuilderConfiguration(
 						"http://localhost/monitoring", 
 						pvpIDPCredentials);									
-			metadatabuilder.buildPVPMetadata(metadataConfig);			
+			metadatabuilder.buildPvpMetadata(metadataConfig);			
 			return TEST_PVPMETADATA + MESSAGE_OK;
 			
 		} catch (Exception | TransformerFactoryConfigurationError e) {
@@ -237,7 +237,7 @@ public class MonitoringController {
 			}
 			
 			//parse metadata
-			DOMUtils.parseXmlNonValidating(method.getResponseBodyAsStream());
+			DomUtils.parseXmlNonValidating(method.getResponseBodyAsStream());
 						
 			return TEST_EIDASNODEMETADATA + MESSAGE_OK;
 			
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/PVP2SProfileEndpoint.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/PVP2SProfileEndpoint.java
index 03c9f70b..19230c62 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/PVP2SProfileEndpoint.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/PVP2SProfileEndpoint.java
@@ -32,31 +32,31 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.impl.AbstractPVP2XProtocol;
-import at.gv.egiz.eaaf.modules.pvp2.idp.impl.PVPSProfilePendingRequest;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.impl.AbstractPvp2XProtocol;
+import at.gv.egiz.eaaf.modules.pvp2.idp.impl.PvpSProfilePendingRequest;
 
 @Controller
-public class PVP2SProfileEndpoint extends AbstractPVP2XProtocol{
+public class PVP2SProfileEndpoint extends AbstractPvp2XProtocol{
 
 	public static final String NAME = PVP2SProfileEndpoint.class.getName();
 	public static final String PROTOCOL_ID = "pvp2-s";
 	
 	@RequestMapping(value = MSeIDASNodeConstants.ENDPOINT_PVP_METADATA, method = {RequestMethod.POST, RequestMethod.GET})
-	public void PVPMetadataRequest(HttpServletRequest req, HttpServletResponse resp) throws EAAFException {		
+	public void PVPMetadataRequest(HttpServletRequest req, HttpServletResponse resp) throws EaafException {		
 		super.pvpMetadataRequest(req, resp);
 		
 	}
 	
 	@RequestMapping(value = MSeIDASNodeConstants.ENDPOINT_PVP_POST, method = {RequestMethod.POST})
-	public void PVPIDPPostRequest(HttpServletRequest req, HttpServletResponse resp) throws EAAFException {
-		super.PVPIDPPostRequest(req, resp);
+	public void PVPIDPPostRequest(HttpServletRequest req, HttpServletResponse resp) throws EaafException {
+		super.pvpIdpPostRequest(req, resp);
 						
 	} 
 	
 	@RequestMapping(value = MSeIDASNodeConstants.ENDPOINT_PVP_REDIRECT, method = {RequestMethod.GET})
-	public void PVPIDPRedirecttRequest(HttpServletRequest req, HttpServletResponse resp) throws EAAFException {
-		super.PVPIDPRedirecttRequest(req, resp);
+	public void PVPIDPRedirecttRequest(HttpServletRequest req, HttpServletResponse resp) throws EaafException {
+		super.pvpIdpRedirecttRequest(req, resp);
 				
 	} 
 	
@@ -72,7 +72,7 @@ public class PVP2SProfileEndpoint extends AbstractPVP2XProtocol{
 	}
 
 	@Override
-	protected boolean childPreProcess(HttpServletRequest arg0, HttpServletResponse arg1, PVPSProfilePendingRequest arg2)
+	protected boolean childPreProcess(HttpServletRequest arg0, HttpServletResponse arg1, PvpSProfilePendingRequest arg2)
 			throws Throwable {
 		return false;
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
index f7367849..bb98f483 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/ProcessEngineSignalController.java
@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-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;
 
 /**
@@ -45,7 +45,7 @@ public class ProcessEngineSignalController extends AbstractProcessEngineSignalCo
 	@RequestMapping(value = {MSeIDASNodeConstants.ENDPOINT_COUNTRYSELECTION
 			                }, 
 			        method = {RequestMethod.POST, RequestMethod.GET})
-	public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EAAFException {
+	public void performGenericAuthenticationProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EaafException {
 		signalProcessManagement(req, resp);
 		
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
index 0a50039e..faaf1e57 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/RevisionLogger.java
@@ -35,7 +35,7 @@ import at.gv.egiz.components.eventlog.api.EventLogFactory;
 import at.gv.egiz.components.eventlog.api.EventLoggingException;
 import at.gv.egiz.eaaf.core.api.IRequest;
 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.logging.IRevisionLogger;
 
 public class RevisionLogger extends EventLogFactory implements IRevisionLogger {
@@ -44,7 +44,7 @@ public class RevisionLogger extends EventLogFactory implements IRevisionLogger {
 	@Autowired private IConfiguration basicConfig;
 	
 	@Override
-	public void logEvent(ISPConfiguration oaConfig, int eventCode, String message) {
+	public void logEvent(ISpConfiguration oaConfig, int eventCode, String message) {
 		logEvent(createNewEvent(new Date().getTime(), eventCode, message));
 		
 	}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/StatisticLogger.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/StatisticLogger.java
index ba44487e..e742c748 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/StatisticLogger.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/logger/StatisticLogger.java
@@ -31,7 +31,7 @@ import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.logging.IStatisticLogger;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
 public class StatisticLogger implements IStatisticLogger {
 
@@ -45,7 +45,7 @@ public class StatisticLogger implements IStatisticLogger {
 	public void logSuccessOperation(IRequest protocolRequest, IAuthData authData, boolean isSSOSession) {		
 		log.info(buildLogMessage(
 				protocolRequest.getUniqueTransactionIdentifier(), 
-				protocolRequest.getSPEntityId(), 
+				protocolRequest.getSpEntityId(), 
 				protocolRequest.getRawData(MSeIDASNodeConstants.DATA_REQUESTERID), 
 				protocolRequest.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier(), 
 				authData.getCiticenCountryCode(), 
@@ -59,8 +59,8 @@ public class StatisticLogger implements IStatisticLogger {
 	@Override
 	public void logErrorOperation(Throwable throwable) {		
 		String errorId = "TODO";
-		if (throwable instanceof EAAFException)
-			errorId = ((EAAFException) throwable).getErrorId();
+		if (throwable instanceof EaafException)
+			errorId = ((EaafException) throwable).getErrorId();
 						
 		log.info(buildLogMessage(
 				StringUtils.EMPTY, 
@@ -78,13 +78,13 @@ public class StatisticLogger implements IStatisticLogger {
 	@Override
 	public void logErrorOperation(Throwable throwable, IRequest errorRequest) {
 		String errorId = "TODO";
-		if (throwable instanceof EAAFException)
-			errorId = ((EAAFException) throwable).getErrorId();
+		if (throwable instanceof EaafException)
+			errorId = ((EaafException) throwable).getErrorId();
 		
 		if (errorRequest != null)	
 			log.info(buildLogMessage(
 					errorRequest.getUniqueTransactionIdentifier(), 
-					errorRequest.getSPEntityId(), 
+					errorRequest.getSpEntityId(), 
 					errorRequest.getRawData(MSeIDASNodeConstants.DATA_REQUESTERID), 
 					errorRequest.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier(), 
 					StringUtils.EMPTY, 
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
index a0b3c695..f92ccf28 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/mapper/LoALevelMapper.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-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.data.ILoALevelMapper;
 
 @Service("LoALevelMapper")
@@ -42,8 +42,8 @@ public class LoALevelMapper implements ILoALevelMapper{
 	}
 
 	@Override
-	public String mapToeIDASLoA(String LoA) {
-		if (LoA.startsWith(EAAFConstants.EIDAS_LOA_PREFIX))
+	public String mapToEidasLoa(String LoA) {
+		if (LoA.startsWith(EaafConstants.EIDAS_LOA_PREFIX))
 			return LoA;
 		
 		else
@@ -54,7 +54,7 @@ public class LoALevelMapper implements ILoALevelMapper{
 	}
 
 	@Override
-	public String mapeIDASQAAToSTORKQAA(String eidasqaaLevel) {
+	public String mapEidasQaaToStorkQaa(String eidasqaaLevel) {
 		return null;
 	}
 
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
index 91cf6515..9a91d407 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-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.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.tasks.AbstractLocaleAuthServletTask;
@@ -58,7 +58,7 @@ public class EvaluateCountrySelectionTask extends AbstractLocaleAuthServletTask
 			while(reqParamNames.hasMoreElements()) {
 				String paramName = reqParamNames.nextElement();
 				if (StringUtils.isNotEmpty(paramName) && 
-						!EAAFConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
+						!EaafConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
 					for (String el : MSeIDASNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST) {
 						if (el.equalsIgnoreCase(paramName))
 							executionContext.put(paramName, 
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
index 49dd6b02..5f3fb20a 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/GenerateCountrySelectionFrameTask.java
@@ -33,12 +33,12 @@ import org.springframework.stereotype.Component;
 import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IGUIBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.ISpringMVCGUIFormBuilder;
+import at.gv.egiz.eaaf.core.api.gui.IGuiBuilderConfiguration;
+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.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.GUIBuildException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.GuiBuildException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 
@@ -50,7 +50,7 @@ import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 	private static final Logger log = LoggerFactory.getLogger(GenerateCountrySelectionFrameTask.class);
 	
-	@Autowired ISpringMVCGUIFormBuilder guiBuilder;
+	@Autowired ISpringMvcGuiFormBuilder guiBuilder;
 	@Autowired IConfiguration basicConfig;
 	
 	@Override
@@ -59,7 +59,7 @@ public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 		try {			
 			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.STARTING_COUNTRY_SELECTION);
 																					
-			IGUIBuilderConfiguration config = new StaticGuiBuilderConfiguration(
+			IGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
 					basicConfig, 
 					pendingReq, 
 					MSeIDASNodeConstants.TEMPLATE_HTML_COUNTRYSELECTION, 
@@ -67,11 +67,11 @@ public class GenerateCountrySelectionFrameTask extends AbstractAuthServletTask {
 					 		 	 
 			guiBuilder.build(request, response, config, "BKU-Selection form");
 			
-		} catch (GUIBuildException e) {	
+		} catch (GuiBuildException e) {	
 			log.warn("Can not build GUI:'BKU-Selection'. Msg:" + e.getMessage());
 			throw new TaskExecutionException(pendingReq, 
 					"Can not build GUI. Msg:" + e.getMessage(), 
-					new EAAFException("gui.00", new Object[]{e.getMessage()}, e));
+					new EaafException("gui.00", new Object[]{e.getMessage()}, e));
 			
 		} catch (Exception e) {
 			log.warn("FinalizeAuthenticationTask has an internal error", e);
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
index eecf777c..2259acd5 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPEndPointCredentialProvider.java
@@ -33,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-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.impl.utils.FileUtils;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
@@ -49,23 +49,23 @@ public class PVPEndPointCredentialProvider extends AbstractCredentialProvider {
 	}
 
 	@Override
-	public String getKeyStoreFilePath() throws EAAFException {
+	public String getKeyStoreFilePath() throws EaafException {
 		try {
 			String path = basicConfiguration.getBasicConfiguration(MSeIDASNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PATH);
 			if (StringUtils.isEmpty(path)) {
 				log.error(getFriendlyName() + " | Path to keyStore is NULL or EMPTY");
-				throw new EAAFConfigurationException("config.27", 
+				throw new EaafConfigurationException("config.27", 
 						new Object[] {getFriendlyName() + " | Path to keyStore is NULL or EMPTY"});
 				
 			}
 			 
-			return FileUtils.makeAbsoluteURL( 
+			return FileUtils.makeAbsoluteUrl( 
 					path, 
 					basicConfiguration.getConfigurationRootDirectory());
 			
 		} catch (MalformedURLException e) {
 			log.error(getFriendlyName() + " | Path to keyStore NOT valid.", e);
-			throw new EAAFConfigurationException("config.27", 
+			throw new EaafConfigurationException("config.27", 
 					new Object[] {getFriendlyName() + " | Path to keyStore NOT valid."}, e);
 			
 		}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
index 35280654..6965a407 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataConfigurationFactory.java
@@ -29,19 +29,19 @@ import org.springframework.stereotype.Service;
 
 import at.asitplus.eidas.specific.connector.config.PVPMetadataConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.IPVP2BasicConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataConfigurationFactory;
+import at.gv.egiz.eaaf.modules.pvp2.api.IPvp2BasicConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataConfigurationFactory;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
 @Service("PVPMetadataConfigurationFactory")
-public class PVPMetadataConfigurationFactory implements IPVPMetadataConfigurationFactory {
+public class PVPMetadataConfigurationFactory implements IPvpMetadataConfigurationFactory {
 
 	@Autowired private IConfiguration basicConfig;
-	@Autowired private IPVP2BasicConfiguration pvpBasicConfig;
+	@Autowired private IPvp2BasicConfiguration pvpBasicConfig;
 	
 	@Override
-	public IPVPMetadataBuilderConfiguration generateMetadataBuilderConfiguration(String authURL, 
+	public IPvpMetadataBuilderConfiguration generateMetadataBuilderConfiguration(String authURL, 
 			AbstractCredentialProvider pvpIDPCredentials) {
 		return new PVPMetadataConfiguration(basicConfig, authURL, pvpBasicConfig, pvpIDPCredentials);
 		
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
index 831338c2..4db6ac5a 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PVPMetadataProvider.java
@@ -41,13 +41,13 @@ import org.springframework.stereotype.Service;
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.connector.verification.MetadataSignatureVerificationFilter;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
-import at.gv.egiz.eaaf.core.exceptions.EAAFConfigurationException;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2MetadataException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
 import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.AbstractChainingMetadataProvider;
 import at.gv.egiz.eaaf.modules.pvp2.impl.metadata.MetadataFilterChain;
-import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.PVPEntityCategoryFilter;
+import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.PvpEntityCategoryFilter;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.SchemaValidationFilter;
 
 @Service("PVPMetadataProvider")
@@ -57,8 +57,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 	@Autowired(required=true) IConfigurationWithSP basicConfig;
 	
 	@Override
-	protected String getMetadataURL(String entityId) throws EAAFConfigurationException {
-		ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
+	protected String getMetadataUrl(String entityId) throws EaafConfigurationException {
+		ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
 		if (spConfig != null) {
 			String metadataURL = entityId;
 			
@@ -79,8 +79,8 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 
 	@Override
 	protected MetadataProvider createNewMetadataProvider(String entityId)
-			throws EAAFConfigurationException, IOException, CertificateException {
-		ISPConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
+			throws EaafConfigurationException, IOException, CertificateException {
+		ISpConfiguration spConfig = basicConfig.getServiceProviderConfiguration(entityId);
 		if (spConfig != null) {
 			try {
 				String metadataURL = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_URL);
@@ -89,7 +89,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 					metadataURL = entityId;
 					
 				}				
-				String trustStoreUrl = FileUtils.makeAbsoluteURL(
+				String trustStoreUrl = FileUtils.makeAbsoluteUrl(
 						spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE), 
 						authConfig.getConfigurationRootDirectory());
 				String trustStorePassword = spConfig.getConfigurationValue(MSeIDASNodeConstants.PROP_CONFIG_SP_PVP2_METADATA_TRUSTSTORE_PASSWORD);
@@ -101,9 +101,9 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 						new BasicParserPool(),
 						createHttpClient(metadataURL));
 				
-			} catch (PVP2MetadataException e) {
+			} catch (Pvp2MetadataException e) {
 				log.info("Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage());
-				throw new EAAFConfigurationException("config.27", 
+				throw new EaafConfigurationException("config.27", 
 						new Object[] {"Can NOT initialize Metadata signature-verification filter. Reason: " + e.getMessage()}, e);
 				
 			}
@@ -115,7 +115,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 	}
 
 	@Override
-	protected List<String> getAllMetadataURLsFromConfiguration() throws EAAFConfigurationException {
+	protected List<String> getAllMetadataUrlsFromConfiguration() throws EaafConfigurationException {
 		// TODO Auto-generated method stub
 		return null;
 	}
@@ -129,7 +129,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 				
 	}
 	
-	private MetadataFilterChain buildMetadataFilterChain(ISPConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, PVP2MetadataException{
+	private MetadataFilterChain buildMetadataFilterChain(ISpConfiguration oaParam, String metadataURL, String trustStoreUrl, String trustStorePassword) throws CertificateException, Pvp2MetadataException{
 		MetadataFilterChain filterChain = new MetadataFilterChain();		
 		filterChain.getFilters().add(new SchemaValidationFilter(
 				basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_SCHEME_VALIDATION, true)));
@@ -138,7 +138,7 @@ public class PVPMetadataProvider extends AbstractChainingMetadataProvider{
 				new MetadataSignatureVerificationFilter(
 						trustStoreUrl, trustStorePassword, metadataURL));
 				
-		filterChain.getFilters().add(new PVPEntityCategoryFilter(
+		filterChain.getFilters().add(new PvpEntityCategoryFilter(
 				basicConfig.getBasicConfigurationBoolean(MSeIDASNodeConstants.PROP_CONFIG_PVP_ENABLE_ENTITYCATEGORIES, true)));
 		
 		return filterChain;		
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
index 875192a1..f4dee848 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/StatusMessageProvider.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eaaf.core.api.IStatusMessenger;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
 @Service("StatusMessageProvider")
 public class StatusMessageProvider implements IStatusMessenger {
@@ -92,8 +92,8 @@ public class StatusMessageProvider implements IStatusMessenger {
 	@Override
 	public String getResponseErrorCode(Throwable throwable) {
 		String errorCode = IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
-		if (throwable instanceof EAAFException) {
-			errorCode = ((EAAFException) throwable).getErrorId();
+		if (throwable instanceof EaafException) {
+			errorCode = ((EaafException) throwable).getErrorId();
 			
 		}
 		//TODO: maybe more internal switches are required
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
index 1fb03689..58ab7930 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
@@ -36,8 +36,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
 
 @Service("SimpleInMemoryTransactionStorage")
 public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
@@ -46,7 +46,7 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 	private Map<String, TransactionStoreElement> storage = new ConcurrentHashMap<String, TransactionStoreElement>();
 	
 	@Override
-	public void changeKey(String oldKey, String newKey, Object value) throws EAAFException {
+	public void changeKey(String oldKey, String newKey, Object value) throws EaafException {
 		if (containsKey(oldKey)) {
 			TransactionStoreElement el = storage.get(oldKey);
 			el.setKey(newKey);
@@ -54,7 +54,7 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 			storage.remove(oldKey);
 			
 		} else
-			throw new EAAFStorageException("No element in TransactionStorage with key: " + oldKey);
+			throw new EaafStorageException("No element in TransactionStorage with key: " + oldKey);
 		
 	}
 
@@ -87,7 +87,7 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 	}
 
 	@Override
-	public Object get(String key) throws EAAFException {
+	public Object get(String key) throws EaafException {
 		if (key != null && containsKey(key)) {
 			TransactionStoreElement element = storage.get(key);
 			return element.getData();
@@ -97,13 +97,13 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 	}
 
 	@Override
-	public <T> T get(String key, Class<T> type) throws EAAFException {
+	public <T> T get(String key, Class<T> type) throws EaafException {
 		return get(key, type, -1);
 		
 	}
 
 	@Override
-	public <T> T get(String key, Class<T> type, long dataTimeOut) throws EAAFException {
+	public <T> T get(String key, Class<T> type, long dataTimeOut) throws EaafException {
 		if (key != null && containsKey(key)) {
 			TransactionStoreElement value = storage.get(key); 
 			
@@ -111,7 +111,7 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 				long now = new Date().getTime();				
 				if (now - value.getCreated().getTime() > dataTimeOut) {
 					log.info("Transaction-Data with key: " + key + " is out of time.");
-					throw new EAAFStorageException("Transaction-Data with key: " + key + " is out of time.");
+					throw new EaafStorageException("Transaction-Data with key: " + key + " is out of time.");
 					
 				}	 				 
 			}
@@ -128,13 +128,13 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 	}
 
 	@Override
-	public Object getRaw(String key) throws EAAFException {
+	public Object getRaw(String key) throws EaafException {
 		return storage.get(key);
 		
 	}
 
 	@Override
-	public void put(String key, Object value, int dataTimeOut) throws EAAFException {
+	public void put(String key, Object value, int dataTimeOut) throws EaafException {
 		TransactionStoreElement element = new TransactionStoreElement();
 		element.setKey(key);
 		element.setData(value);
@@ -143,7 +143,7 @@ public class SimpleInMemoryTransactionStorage implements ITransactionStorage{
 	}
 
 	@Override
-	public void putRaw(String key, Object value) throws EAAFException {
+	public void putRaw(String key, Object value) throws EaafException {
 		if (value instanceof TransactionStoreElement)
 			storage.put(((TransactionStoreElement) value).getKey(), (TransactionStoreElement) value);		
 		else 
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
index 270d0e31..be7812f4 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/eIDASCacheTransactionStoreDecorator.java
@@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
 
 public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 	private static final Logger log = LoggerFactory.getLogger(eIDASCacheTransactionStoreDecorator.class);
@@ -40,7 +40,7 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 	@Autowired(required=true) private CacheWitheIDASBackend storage;
 	
 	@Override
-	public void changeKey(String oldKey, String newKey, Object value) throws EAAFException {
+	public void changeKey(String oldKey, String newKey, Object value) throws EaafException {
 		if (containsKey(oldKey)) {
 			TransactionStoreElement el = storage.get(oldKey);
 			el.setKey(newKey);
@@ -49,7 +49,7 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 			storage.remove(oldKey);
 			
 		} else
-			throw new EAAFStorageException("No element in TransactionStorage with key: " + oldKey);
+			throw new EaafStorageException("No element in TransactionStorage with key: " + oldKey);
 		
 	}
 
@@ -67,7 +67,7 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 	}
 
 	@Override
-	public Object get(String key) throws EAAFException {
+	public Object get(String key) throws EaafException {
 		if (key != null && containsKey(key)) {
 			TransactionStoreElement element = storage.get(key);
 			return element.getData();
@@ -77,13 +77,13 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 	}
 
 	@Override
-	public <T> T get(String key, Class<T> type) throws EAAFException {
+	public <T> T get(String key, Class<T> type) throws EaafException {
 		return get(key, type, -1);
 		
 	}
 
 	@Override
-	public <T> T get(String key, Class<T> type, long dataTimeOut) throws EAAFException {
+	public <T> T get(String key, Class<T> type, long dataTimeOut) throws EaafException {
 		if (key != null && containsKey(key)) {
 			TransactionStoreElement value = storage.get(key); 
 			
@@ -91,7 +91,7 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 				long now = new Date().getTime();				
 				if (now - value.getCreated().getTime() > dataTimeOut) {
 					log.info("Transaction-Data with key: " + key + " is out of time.");
-					throw new EAAFStorageException("Transaction-Data with key: " + key + " is out of time.");
+					throw new EaafStorageException("Transaction-Data with key: " + key + " is out of time.");
 					
 				}	 				 
 			}
@@ -108,13 +108,13 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 	}
 
 	@Override
-	public Object getRaw(String key) throws EAAFException {
+	public Object getRaw(String key) throws EaafException {
 		return storage.get(key);
 		
 	}
 
 	@Override
-	public void put(String key, Object value, int dataTimeOut) throws EAAFException {
+	public void put(String key, Object value, int dataTimeOut) throws EaafException {
 		TransactionStoreElement element = new TransactionStoreElement();
 		element.setKey(key);
 		element.setData(value);
@@ -123,7 +123,7 @@ public class eIDASCacheTransactionStoreDecorator implements ITransactionStorage{
 	}
 
 	@Override
-	public void putRaw(String key, Object value) throws EAAFException {
+	public void putRaw(String key, Object value) throws EaafException {
 		if (value instanceof TransactionStoreElement)
 			storage.put(((TransactionStoreElement) value).getKey(), (TransactionStoreElement) value);		
 		else 
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
index 94b0cc02..c49c0b28 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/AuthnRequestValidator.java
@@ -44,16 +44,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
 import at.asitplus.eidas.specific.connector.config.ServiceProviderConfiguration;
 import at.gv.egiz.eaaf.core.api.IRequest;
-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.exceptions.AuthnRequestValidatorException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.exceptions.EAAFStorageException;
-import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttribute;
-import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EAAFRequestedAttributes;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute;
+import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttributes;
 import at.gv.egiz.eaaf.modules.pvp2.api.validation.IAuthnRequestValidator;
-import at.gv.egiz.eaaf.modules.pvp2.exception.NameIDFormatNotSupportedException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.NameIdFormatNotSupportedException;
 import eu.eidas.auth.commons.protocol.eidas.LevelOfAssurance;
 
 public class AuthnRequestValidator implements IAuthnRequestValidator {
@@ -74,7 +74,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 					if ( !(NameID.TRANSIENT.equals(nameIDFormat) ||
 							NameID.PERSISTENT.equals(nameIDFormat)) ) {
 						 
-						throw new NameIDFormatNotSupportedException(nameIDFormat);
+						throw new NameIdFormatNotSupportedException(nameIDFormat);
 						
 					}
 					  
@@ -107,9 +107,9 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 			
 			LevelOfAssurance minimumLoAFromConfig = LevelOfAssurance.fromString(basicConfig.getBasicConfiguration(
 					MSeIDASNodeConstants.PROP_EIDAS_REQUEST_LOA_MINIMUM_LEVEL, 
-					EAAFConstants.EIDAS_LOA_HIGH));
+					EaafConstants.EIDAS_LOA_HIGH));
 			if (minimumLoAFromConfig == null) {
-				log.warn("Can not load minimum LoA from configuration. Use LoA: {} as default", EAAFConstants.EIDAS_LOA_HIGH);
+				log.warn("Can not load minimum LoA from configuration. Use LoA: {} as default", EaafConstants.EIDAS_LOA_HIGH);
 				minimumLoAFromConfig = LevelOfAssurance.HIGH;
 				
 			}
@@ -119,7 +119,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 			for (String loa : reqLoA) {				
 				try {
 					LevelOfAssurance intLoa = LevelOfAssurance.fromString(loa);
-					String selectedLoA = EAAFConstants.EIDAS_LOA_HIGH;
+					String selectedLoA = EaafConstants.EIDAS_LOA_HIGH;
 					if (intLoa != null && 
 							intLoa.numericValue() >= minimumLoAFromConfig.numericValue()) {
 						log.info("Client: {} requested LoA: {} will be upgraded to: {}", 
@@ -155,12 +155,12 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 			boolean sectorDetected = false;
 			List<XMLObject> requestedAttributes = authnReq.getExtensions().getUnknownXMLObjects();
 			for (XMLObject reqAttrObj : requestedAttributes) {
-				if (reqAttrObj instanceof EAAFRequestedAttributes) {
-					EAAFRequestedAttributes reqAttr = (EAAFRequestedAttributes)reqAttrObj;
+				if (reqAttrObj instanceof EaafRequestedAttributes) {
+					EaafRequestedAttributes reqAttr = (EaafRequestedAttributes)reqAttrObj;
 					if (reqAttr.getAttributes() != null && reqAttr.getAttributes().size() != 0 ) {
-						for (EAAFRequestedAttribute el : reqAttr.getAttributes()) {
+						for (EaafRequestedAttribute el : reqAttr.getAttributes()) {
 							log.trace("Processing req. attribute '" + el.getName() + "' ... ");
-							if (el.getName().equals(PVPAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME)) {
+							if (el.getName().equals(PvpAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME)) {
 								if (el.getAttributeValues() != null && el.getAttributeValues().size() == 1) {
 									String sectorId = el.getAttributeValues().get(0).getDOM().getTextContent();
 									ServiceProviderConfiguration spConfig = pendingReq.getServiceProviderConfiguration(ServiceProviderConfiguration.class);
@@ -169,7 +169,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 										spConfig.setbPKTargetIdentifier(sectorId);
 										sectorDetected = true;
 										
-									} catch (EAAFException e) {
+									} catch (EaafException e) {
 										log.info("Requested sector: " + sectorId + " DOES NOT match to allowed sectors for SP: " + spConfig.getUniqueIdentifier());
 									}
 									
@@ -195,7 +195,7 @@ public class AuthnRequestValidator implements IAuthnRequestValidator {
 				
 			}
 					
-		} catch (EAAFStorageException e) {
+		} catch (EaafStorageException e) {
 			log.info("Can NOT store Authn. Req. data into pendingRequest." , e);
 			throw new AuthnRequestValidatorException("internal.02", null, e);
 			
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java
index bf10de82..eeaea135 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/verification/MetadataSignatureVerificationFilter.java
@@ -43,10 +43,10 @@ import org.opensaml.xml.validation.ValidationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.impl.utils.KeyStoreUtils;
-import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2MetadataException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.exception.SAMLRequestNotSignedException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.exception.SamlRequestNotSignedException;
 import at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata.AbstractMetadataSignatureFilter;
 
 public class MetadataSignatureVerificationFilter extends AbstractMetadataSignatureFilter{
@@ -56,7 +56,7 @@ public class MetadataSignatureVerificationFilter extends AbstractMetadataSignatu
 	private List<BasicX509Credential> trustedCredential = new ArrayList<BasicX509Credential>();
 	
 	public MetadataSignatureVerificationFilter(String trustStorePath, String trustStorePassword, String metadataURL) 
-			throws PVP2MetadataException {
+			throws Pvp2MetadataException {
 		this.metadataURL = metadataURL;
 		
 		log.trace("Initialize metadata signature-verification filter with truststore: " + trustStorePath + " ... ");
@@ -84,12 +84,12 @@ public class MetadataSignatureVerificationFilter extends AbstractMetadataSignatu
 				
 				
 			} else
-				throw new PVP2MetadataException("pvp2.26", 
+				throw new Pvp2MetadataException("pvp2.26", 
 						new Object[] {"Can not open trustStore: " + trustStorePath + " for metadata: " + metadataURL});
 			
 		} catch (KeyStoreException | IOException e) {
 			log.warn("Can not open trustStore: " + trustStorePath + " for metadata: " + metadataURL + " Reason: " + e.getMessage(), e);
-			throw new PVP2MetadataException("pvp2.26", 
+			throw new Pvp2MetadataException("pvp2.26", 
 					new Object[] {"Can not open trustStore: " + trustStorePath + " for metadata"}, e);
 			
 		}
@@ -99,36 +99,36 @@ public class MetadataSignatureVerificationFilter extends AbstractMetadataSignatu
 	
 	
 	@Override
-	protected void verify(EntityDescriptor desc) throws PVP2MetadataException {
+	protected void verify(EntityDescriptor desc) throws Pvp2MetadataException {
 		try {
 			internalVerify(desc);
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.info("Metadata verification FAILED for: " + metadataURL + " Reason: " +e.getMessage());
-			throw new PVP2MetadataException("pvp2.26", 
+			throw new Pvp2MetadataException("pvp2.26", 
 					new Object[] {"Metadata verification FAILED for: " + metadataURL + " Reason: " +e.getMessage()}, e); 
 			
 		}		
 	}
 
 	@Override
-	protected void verify(EntitiesDescriptor desc) throws PVP2MetadataException {
-		throw new PVP2MetadataException("pvp2.26", 
+	protected void verify(EntitiesDescriptor desc) throws Pvp2MetadataException {
+		throw new Pvp2MetadataException("pvp2.26", 
 				new Object[] {"EntitiesDescritors are NOT supported"});
 		
 	}
 
 	@Override
-	protected void verify(EntityDescriptor entity, EntitiesDescriptor desc) throws PVP2MetadataException {
-		throw new PVP2MetadataException("pvp2.26", 
+	protected void verify(EntityDescriptor entity, EntitiesDescriptor desc) throws Pvp2MetadataException {
+		throw new Pvp2MetadataException("pvp2.26", 
 				new Object[] {"EntitiesDescritors are NOT supported"});
 		
 	}
 	
 	private void internalVerify(SignableSAMLObject signedElement)
-			throws EAAFException {
+			throws EaafException {
 		if (signedElement.getSignature() == null) {
-			throw new SAMLRequestNotSignedException();
+			throw new SamlRequestNotSignedException();
 		}
 
 		try {
@@ -136,7 +136,7 @@ public class MetadataSignatureVerificationFilter extends AbstractMetadataSignatu
 			sigValidator.validate(signedElement.getSignature());
 		} catch (ValidationException e) {
 			log.error("Failed to validate Signature", e);
-			throw new SAMLRequestNotSignedException(e);
+			throw new SamlRequestNotSignedException(e);
 		}
 
 		boolean isTrusted = false;
@@ -155,7 +155,7 @@ public class MetadataSignatureVerificationFilter extends AbstractMetadataSignatu
 		
 		if (!isTrusted) {
 			log.warn("PVP2 metadata: " + metadataURL + " are NOT trusted!");
-			throw new SAMLRequestNotSignedException();
+			throw new SamlRequestNotSignedException();
 			
 		}