changed variablenames after nameconvention