That's correct. The nuclear facility definition was taken from ICSANT; the nuclear material definition existed in the Criminal Code from the 1980 convention and is consistent with the original CPPNM, article 1; the radioactive material definition was taken from ICSANT, article 1; and the device definition was taken from ICSANT, article 1.
On February 6th, 2013. See this statement in context.