renaming ValueType and VariableType