Made Pavlov.old_{stuff} use Pavlov.{stuff}

Paving the upgrade path. We can now set expectations on the new shortcuts instead of the old shortcuts, so we can at some point eliminate the old shortcuts