update for SPR name change
SPR: merge updates from master