update some names to be consistent with scheme naming