What are the steps to upgrade from 100T to 1600T?

I have been running as a captain with a 100T for 10 years. My MMD is AB UNLM/STCW/RFPNW/PCS-LBM. I switched companies to work as an AB on 2000T boats. Am I right in assuming that by taking the courses: Radar/OICNW/ADV FIRE I would qualify to take the exam for 1600T NC Master as my next ticket. What say ye?