update some names and vars due to migration