diff --git a/install/cl_apply_template.py b/install/cl_apply_template.py
index 2bf4a3a..e5c79ba 100644
--- a/install/cl_apply_template.py
+++ b/install/cl_apply_template.py
@@ -21,7 +21,7 @@ from cl_install import InstallError
 __version__ = cl_install.__version__
 __app__ = cl_install.__app__
 
-from calculate.lib.cl_datavars import DataVars
+from calculate.lib.datavars import DataVars
 from calculate.lib.cl_template import template, templateClt
 from calculate.lib.cl_print import color_print
 from calculate.lib import cl_overriding
diff --git a/install/cl_install.py b/install/cl_install.py
index d35fa4b..d09e4b5 100644
--- a/install/cl_install.py
+++ b/install/cl_install.py
@@ -63,7 +63,7 @@ defaultPrintERROR = cl_overriding.printERROR
 
 from calculate.lib.variables import Locale
 from calculate.lib.cl_template import Template,TemplatesError
-from calculate.lib.cl_datavars import ClDataVars
+from calculate.lib.datavars import DataVars
 from calculate.lib.cl_print import color_print
 from cl_distr import (PartitionDistributive,
                 DistributiveError, ScratchPartitionDistributive,
diff --git a/install/cl_vars_install.py b/install/cl_vars_install.py
index cf0c198..8bf950a 100644
--- a/install/cl_vars_install.py
+++ b/install/cl_vars_install.py
@@ -20,7 +20,7 @@
 #   printval - print value of variable
 from cl_install import __version__, __app__
 from calculate.lib.cl_vars import Data as LibData
-from calculate.lib.cl_datavars import Variables
+from calculate.lib.datavars import Variables
 from calculate.lib.variables import System, Net, Env, X11
 from calculate.install.variables import (InstallAction, InstallLocale,
                 Distro,InstallKernel,InstallX11,InstallNet,
diff --git a/install/cl_wsdl_install.py b/install/cl_wsdl_install.py
index b710069..550cb34 100644
--- a/install/cl_wsdl_install.py
+++ b/install/cl_wsdl_install.py
@@ -23,7 +23,7 @@ from soaplib.service import rpc, DefinitionBase
 from calculate.api.server.api_types import ReturnedMessage, getViewForVariables
 from calculate.api.server.api_types import ChoiceValue, Table, Option, Field, \
                                            GroupField, ViewInfo
-from calculate.lib.cl_datavars import VariableError
+from calculate.lib.datavars import VariableError
 
 #from cl_install import Install,DataVarsInstall
 import cl_install
@@ -187,5 +187,6 @@ class Wsdl:
                     default = 'color:red;',
                     element = "label"))
             view.groups.append(group)
+            raise
             return view
 
diff --git a/install/datavars.py b/install/datavars.py
index b0a6abb..34d5452 100644
--- a/install/datavars.py
+++ b/install/datavars.py
@@ -16,12 +16,12 @@
 
 import os
 import sys
-from calculate.lib.cl_datavars import ClDataVars
+from calculate.lib.datavars import DataVars
 
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_install',sys.modules[__name__])
 
-class DataVarsInstall(ClDataVars):
+class DataVarsInstall(DataVars):
     """Variable class for installation"""
 
     def importInstall(self, **args):
diff --git a/install/variables/X11.py b/install/variables/X11.py
index 92c947c..9b4a5a0 100644
--- a/install/variables/X11.py
+++ b/install/variables/X11.py
@@ -18,7 +18,7 @@ import os
 import sys
 import re
 from os import path
-from calculate.lib.cl_datavars import Variables,VariableError
+from calculate.lib.datavars import Variables,VariableError
 from calculate.lib.variables import X11
 from calculate.lib.utils.portage import isPkgInstalled
 from calculate.lib.utils.files import process,STDOUT,getProgPath
diff --git a/install/variables/action.py b/install/variables/action.py
index e2d7eff..29c051c 100644
--- a/install/variables/action.py
+++ b/install/variables/action.py
@@ -17,7 +17,7 @@
 import os
 import sys
 from os import path
-from calculate.lib.cl_datavars import Variables
+from calculate.lib.datavars import Variables
 
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_install',sys.modules[__name__])
diff --git a/install/variables/disk.py b/install/variables/disk.py
index 22728ce..64f0871 100644
--- a/install/variables/disk.py
+++ b/install/variables/disk.py
@@ -18,7 +18,7 @@ import os
 import sys
 import re
 from os import path
-from calculate.lib.cl_datavars import Variables,VariableError
+from calculate.lib.datavars import Variables,VariableError
 #from calculate.lib.utils import ../calculate-lib3/calculate/lib/utils/device.py
 from calculate.lib.utils.device import (getUdevDeviceInfo,getDeviceType,
                         getPartitionType,getPartitionDevice,getRaidPartitions,
diff --git a/install/variables/distr.py b/install/variables/distr.py
index 6490b1b..d95546a 100644
--- a/install/variables/distr.py
+++ b/install/variables/distr.py
@@ -19,7 +19,7 @@ import sys
 from os import path
 import re
 import operator
-from calculate.lib.cl_datavars import Variables,VariableError
+from calculate.lib.datavars import Variables,VariableError
 from calculate.lib.utils.common import getSupportArch,getTupleVersion
 from calculate.lib.utils.files import readLinesFile, listDirectory
 from calculate.lib.variables import Linux
diff --git a/install/variables/kernel.py b/install/variables/kernel.py
index 0001ae2..b59b98c 100644
--- a/install/variables/kernel.py
+++ b/install/variables/kernel.py
@@ -17,7 +17,7 @@
 import os
 import sys
 from os import path
-from calculate.lib.cl_datavars import Variables
+from calculate.lib.datavars import Variables
 
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('cl_install',sys.modules[__name__])
diff --git a/install/variables/linux.py b/install/variables/linux.py
index 04e3582..b27e525 100644
--- a/install/variables/linux.py
+++ b/install/variables/linux.py
@@ -17,7 +17,7 @@
 import os
 import sys
 from os import path
-from calculate.lib.cl_datavars import Variables
+from calculate.lib.datavars import Variables
 from calculate.lib.variables import Linux
 
 from calculate.lib.cl_lang import setLocalTranslate
diff --git a/install/variables/locale.py b/install/variables/locale.py
index a4bc250..b378482 100644
--- a/install/variables/locale.py
+++ b/install/variables/locale.py
@@ -17,7 +17,7 @@
 import os
 import sys
 from os import path
-from calculate.lib.cl_datavars import Variables, VariableError
+from calculate.lib.datavars import Variables, VariableError
 from calculate.lib.variables import Locale
 from calculate.lib.utils.files import readLinesFile, process
 from calculate.lib.utils.common import getValueFromCmdLine, getValueFromConfig
diff --git a/install/variables/net.py b/install/variables/net.py
index da9bdc8..9ce1331 100644
--- a/install/variables/net.py
+++ b/install/variables/net.py
@@ -18,7 +18,7 @@ import os
 import sys
 import re
 from os import path
-from calculate.lib.cl_datavars import Variables,VariableError
+from calculate.lib.datavars import Variables,VariableError
 from calculate.lib.variables import Net
 
 from calculate.lib.cl_lang import setLocalTranslate
diff --git a/install/variables/system.py b/install/variables/system.py
index 64201ed..83df4e8 100644
--- a/install/variables/system.py
+++ b/install/variables/system.py
@@ -18,7 +18,7 @@ import os
 import sys
 import re
 from os import path
-from calculate.lib.cl_datavars import Variables,VariableError
+from calculate.lib.datavars import Variables,VariableError
 from calculate.lib.variables import System
 from calculate.install.cl_install import FileSystemManager
 from calculate.lib.utils.files import readFile,getProgPath,process
diff --git a/scripts/cl-install3 b/scripts/cl-install3
index 2ad8312..8967250 100644
--- a/scripts/cl-install3
+++ b/scripts/cl-install3
@@ -27,7 +27,7 @@ from calculate.api.client.function import *
 from calculate.api.client.pid_information import *
 from calculate.api.client.cert_func import *
 from calculate.api.client.sid_func import *
-from calculate.lib.cl_datavars import DataVars
+from calculate.lib.datavars import DataVars
 
 from calculate.api.client.client_class import HTTPSClientAuthHandler, HTTPSClientCertTransport