transition period code changes before we get rid of this
use cannonical name