Have the guarantees for tenure changed?

No. The guarantees are identical to the current APP (revised APP, Section 4.3).