Decrease the use of generate-id(): Phase 3

Use ahf:generateId instead.