renamed variables

Import helper: ln 1872?