Question about procedure Upgrading to R6

I am reading the Red Book Upgrading to LN and Domino 6 about upgrading. I am confused about the items about upgrading the Domino Directory.I want to upgrade server and Dir. at the same time (page 65). I have to create my own Master Template. I assume that this is still a R5 template.

After upgrading the server code, I have to rename my new Domino Directory Template to pubnames.ntf (from my Master Template ???).

Then I have the server let upgrade the design by answering Y after restarting the server. (p.67)

But . . . .On page 104, the Post Upgrade Tasks, the Note IMPORTANT - 1: Rename the previously renames Pubnames.ntf back to pubnames.ntf ??? (I thought I had already done it, on p.66).

Now here is described that I have to run several tasks to upgrade the design form the OS-prompt and answer No when the server asks it to do after the first start.

I lookes to me that with this method I keep the R5 design of the pubnames.ntf . . .

Is it possible to forgot renaming pubnames.ntf and install the R6 code (after the appropiate backup-tasks) and then follow the procedure on page 104 en further ??