diff --git a/AMDiS/src/ZeroOrderTerm.cc b/AMDiS/src/ZeroOrderTerm.cc
index 4867c9f4dd3ce7b9d9a5712df770d9bbb27acc7c..c324829e2c732ee9ec76257cf19d60e623819d67 100644
--- a/AMDiS/src/ZeroOrderTerm.cc
+++ b/AMDiS/src/ZeroOrderTerm.cc
@@ -61,8 +61,8 @@ namespace AMDiS {
 
   void VecAtQP_ZOT::eval( int nPoints,
 			  const mtl::dense_vector<double>& uhAtQP,
-			  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			  mtl::dense_vector<double>& result,
 			  double fac) 
   {
@@ -111,8 +111,8 @@ namespace AMDiS {
 
   void MultVecAtQP_ZOT::eval( int nPoints,
 			      const mtl::dense_vector<double>& uhAtQP,
-			      const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			      const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			      const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			      const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			      mtl::dense_vector<double>& result,
 			      double fac) 
   {
@@ -163,8 +163,8 @@ namespace AMDiS {
 
   void Vec2AtQP_ZOT::eval(int nPoints,
 			  const mtl::dense_vector<double>& uhAtQP,
-			  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			  mtl::dense_vector<double>& result,
 			  double fac) 
   {
@@ -207,8 +207,8 @@ namespace AMDiS {
 
   void Vec3AtQP_ZOT::eval(int nPoints,
 			  const mtl::dense_vector<double>& uhAtQP,
-			  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			  mtl::dense_vector<double>& result,
 			  double fac) 
   {
@@ -245,8 +245,8 @@ namespace AMDiS {
  
   void FctGradientCoords_ZOT::eval( int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -284,8 +284,8 @@ namespace AMDiS {
  
   void VecGradCoordsAtQP_ZOT::eval( int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -324,8 +324,8 @@ namespace AMDiS {
 
   void VecAndCoordsAtQP_ZOT::eval(int nPoints,
 				  const mtl::dense_vector<double>& uhAtQP,
-				  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				  mtl::dense_vector<double>& result,
 				  double fac) 
   {
@@ -358,8 +358,8 @@ namespace AMDiS {
 
   void Vec2AndGradAtQP_ZOT::eval( int nPoints,
 				  const mtl::dense_vector<double>& uhAtQP,
-				  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				  mtl::dense_vector<double>& result,
 				  double fac) 
   {
@@ -403,8 +403,8 @@ namespace AMDiS {
  
   void FctGradient_ZOT::eval( int nPoints,
 			      const mtl::dense_vector<double>& uhAtQP,
-			      const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			      const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			      const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			      const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			      mtl::dense_vector<double>& result,
 			      double fac) 
   {
@@ -440,8 +440,8 @@ namespace AMDiS {
  
   void VecAndGradAtQP_ZOT::eval(int nPoints,
 				const mtl::dense_vector<double>& uhAtQP,
-				const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				mtl::dense_vector<double>& result,
 				double fac) 
   {
@@ -480,8 +480,8 @@ namespace AMDiS {
  
   void VecAndGradVecAtQP_ZOT::eval( int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -524,8 +524,8 @@ namespace AMDiS {
  
   void VecAndGradVec2AtQP_ZOT::eval(int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -577,8 +577,8 @@ namespace AMDiS {
 
   void VecOfDOFVecsAtQP_ZOT::eval(int nPoints,
 				  const mtl::dense_vector<double>& uhAtQP,
-				  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				  mtl::dense_vector<double>& result,
 				  double fac) 
   {
@@ -633,8 +633,8 @@ namespace AMDiS {
 
   void VecOfGradientsAtQP_ZOT::eval(int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -692,8 +692,8 @@ namespace AMDiS {
 
   void VecDivergence_ZOT::eval( int nPoints,
 				const mtl::dense_vector<double>& uhAtQP,
-				const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				mtl::dense_vector<double>& result,
 			        double fac) 
   {
@@ -755,8 +755,8 @@ namespace AMDiS {
 
   void VecAndVecOfGradientsAtQP_ZOT::eval(int nPoints,
 					  const mtl::dense_vector<double>& uhAtQP,
-					  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-					  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+					  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+					  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 					  mtl::dense_vector<double>& result,
 					  double fac) 
   {
@@ -799,8 +799,8 @@ namespace AMDiS {
  
   void Vec2AndGrad2AtQP_ZOT::eval(int nPoints,
 				  const mtl::dense_vector<double>& uhAtQP,
-				  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				  mtl::dense_vector<double>& result,
 				  double fac) 
   {
@@ -851,8 +851,8 @@ namespace AMDiS {
   
   void Vec2AndGradVecAtQP_ZOT::eval(int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -919,8 +919,8 @@ namespace AMDiS {
 
   void General_ZOT::eval( int nPoints,
 			  const mtl::dense_vector<double>& uhAtQP,
-			  const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			  const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			  const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			  const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			  mtl::dense_vector<double>& result,
 			  double fac) 
   {
@@ -1000,8 +1000,8 @@ namespace AMDiS {
 
   void GeneralParametric_ZOT::eval( int nPoints,
 				    const mtl::dense_vector<double>& uhAtQP,
-				    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-				    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+				    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+				    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 				    mtl::dense_vector<double>& result,
 				    double fac) 
   {
@@ -1039,8 +1039,8 @@ namespace AMDiS {
 
   void CoordsAtQP_ZOT::eval(int nPoints,
 			    const mtl::dense_vector<double>& uhAtQP,
-			    const mtl::dense_vector<typename GradientType<double>::type>& grdUhAtQP,
-			    const mtl::dense_vector<typename D2Type<double>::type>& D2UhAtQP,
+			    const mtl::dense_vector<WorldVector<double> >& grdUhAtQP,
+			    const mtl::dense_vector<WorldMatrix<double> >& D2UhAtQP,
 			    mtl::dense_vector<double>& result,
 			    double fac) 
   {