Yes, it is correct. This whole scheme of transfer of electrons, starting from the PS II, uphill to the accepter, down the electron transport chain to PS I, excitation of electrons, transfer to another accepter, and finally down hill to NADP+ causing it to be reduced to NADPH+H+ is called the Z scheme.