They have stopped distinguishing between OCA and OCP. It is only OCP now, part I (815) and part II (816). The two are being combined into one test in a few weeks (819).
For the 819, you can use either the complete study guide or the 815 and 816 books together. For the 817, you can use the 816/817 book or the complete study guide