Wiring for replacement timer on Creda 48345 cooker?

Just got a replacement timer for a Creda 48345 cooker and the connections are different.
The old timer was ref: 13156-067 Typ 311/162 T120
The connections were;
1 & 2 Timer
3 & 4 Relay for main (bottom) oven
5 & 6 Relay for small (top) oven
The new timer is ref: EL198/380.211 Ivensys W16200179200
The connections are;
N/7 & N/8
1 & 1a Relay
2 & 2a Relay

Am I correct in assuming that the connections should now be;
Old 1 to new N/7
Old 2 to new N/8
Old 3 to new 1
Old 4 to new 1a
Old 5 to new 2
Old 6 to new 2a
Is this correct?

Stephen
June 2013