diff --git a/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp b/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
index 641635837bcfc748224351112fbfed78ef299a3e..be14d6b09e82922b838faed5ebb1212c944ee74d 100644
--- a/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/AnyaryOperationAbstraction.hpp
@@ -31,7 +31,7 @@ private:
 		if ( input == nullptr )
 			return false;
 
-		if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamType > >::checkInput ( input, 0 /* Note: yes index zero */ ) )
+		if ( checkInput && ! abstraction::checkInput < ValueProvider < ParamType > > ( input, 0 /* Note: yes index zero */ ) )
 			return false;
 
 		if ( m_params.size ( ) < index + 1 )
diff --git a/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp b/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
index 7b3f0a5bd0f7cc06cf31fe28977e79f8573196b5..0d84d97d37e51f8cb9497ba2d4c91ac4249c66f3 100644
--- a/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/NaryOperationAbstraction.hpp
@@ -35,7 +35,7 @@ private:
 		if ( input == nullptr )
 			return false;
 
-		if ( checkInput && ! abstraction::CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input, index ) )
+		if ( checkInput && ! abstraction::checkInput < ValueProvider < ParamTypes > ... > ( input, index ) )
 			return false;
 
 		m_params [ index ].first = input;
@@ -89,11 +89,11 @@ public:
 	}
 
 	ext::type_index getParamTypeIndex ( size_t index ) const override {
-		return abstraction::ParamType < ParamTypes ... >::paramType ( index );
+		return abstraction::paramType < ParamTypes ... > ( index );
 	}
 
 	ext::set < abstraction::ParamQualifiers::ParamQualifier > getParamTypeQualifiers ( size_t index ) const override {
-		return abstraction::ParamType < ParamTypes ... >::paramTypeQualifiers ( index );
+		return abstraction::paramTypeQualifiers < ParamTypes ... > ( index );
 	}
 
 };
diff --git a/alib2abstraction/src/abstraction/WrapperAbstraction.hpp b/alib2abstraction/src/abstraction/WrapperAbstraction.hpp
index ed30b15a1ba8ecad4378032490e937fcce083a87..3e6b815d6eb4e147b4e16d7d8feeb16655940ae3 100644
--- a/alib2abstraction/src/abstraction/WrapperAbstraction.hpp
+++ b/alib2abstraction/src/abstraction/WrapperAbstraction.hpp
@@ -49,7 +49,7 @@ private:
 		if ( input == nullptr )
 			return false;
 
-		if ( checkInput && ! CheckInput < ValueProvider < ParamTypes > ... >::checkInput ( input, index ) )
+		if ( checkInput && ! abstraction::checkInput < ValueProvider < ParamTypes > ... > ( input, index ) )
 			return false;
 
 		m_params [ index ].first = input;
@@ -105,11 +105,11 @@ public:
 	}
 
 	ext::type_index getParamTypeIndex ( size_t index ) const override {
-		return ParamType < ParamTypes ... >::paramType ( index );
+		return abstraction::paramType < ParamTypes ... > ( index );
 	}
 
 	ext::set < abstraction::ParamQualifiers::ParamQualifier > getParamTypeQualifiers ( size_t index ) const override {
-		return ParamType < ParamTypes ... >::paramTypeQualifiers ( index );
+		return abstraction::paramTypeQualifiers < ParamTypes ... > ( index );
 	}
 
 	std::shared_ptr < abstraction::OperationAbstraction > getProxyAbstraction ( ) override {
diff --git a/alib2abstraction/src/common/AbstractionHelpers.hpp b/alib2abstraction/src/common/AbstractionHelpers.hpp
index f4e84c11bb18b9a5e2b2a64d6a995f9f9fa84ccf..891cbe8d51b4daf595b18cfcab70c24548497e49 100644
--- a/alib2abstraction/src/common/AbstractionHelpers.hpp
+++ b/alib2abstraction/src/common/AbstractionHelpers.hpp
@@ -35,46 +35,43 @@ constexpr decltype ( auto ) apply ( F && f, Tuple && t ) {
 }
 
 template < class ... Params >
-struct CheckInput {
-	static bool checkInput ( const std::shared_ptr < OperationAbstraction > & operation, unsigned index ) {
-		bool res = false;
+bool checkInput ( const std::shared_ptr < OperationAbstraction > & operation, unsigned index ) {
+	bool res = false;
 
-		auto lambda = [ & ] ( auto I ) {
-			 res = ( bool ) std::dynamic_pointer_cast < std::decay_t < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > > ( operation->getProxyAbstraction ( ) );
-		};
+	auto lambda = [ & ] ( auto I ) {
+		 res = ( bool ) std::dynamic_pointer_cast < std::decay_t < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > > ( operation->getProxyAbstraction ( ) );
+	};
 
-		ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
+	ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
 
-		return res;
-	}
-};
+	return res;
+}
 
 template < class ... Params >
-struct ParamType {
-	static ext::type_index paramType ( unsigned index ) {
-		ext::type_index res ( typeid ( void ) );
+static ext::type_index paramType ( unsigned index ) {
+	ext::type_index res ( typeid ( void ) );
 
-		auto lambda = [ & ] ( auto I ) {
-			res = ext::type_index ( typeid ( std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > ) );
-		};
+	auto lambda = [ & ] ( auto I ) {
+		res = ext::type_index ( typeid ( std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > ) );
+	};
 
-		ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
+	ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
 
-		return res;
-	}
+	return res;
+}
 
-	static ext::set < abstraction::ParamQualifiers::ParamQualifier > paramTypeQualifiers ( unsigned index ) {
-		ext::set < abstraction::ParamQualifiers::ParamQualifier > res;
+template < class ... Params >
+ext::set < abstraction::ParamQualifiers::ParamQualifier > paramTypeQualifiers ( unsigned index ) {
+	ext::set < abstraction::ParamQualifiers::ParamQualifier > res;
 
-		auto lambda = [ & ] ( auto I ) {
-			res = abstraction::ParamQualifiers::paramQualifiers < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > ( );
-		};
+	auto lambda = [ & ] ( auto I ) {
+		res = abstraction::ParamQualifiers::paramQualifiers < std::tuple_element_t < decltype ( I )::value, std::tuple < Params ... > > > ( );
+	};
 
-		ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
+	ext::constexpr_switch < sizeof ... ( Params ) > ( index, lambda );
 
-		return res;
-	}
-};
+	return res;
+}
 
 } /* namespace abstraction */