Fix additional logic that hadn't been transitioned to new name