Just found this video on youtube:
Pretty much explains everything there is to know about the upcoming massive update and new hardware from Traktor / Native Instruments, and yes it is not called the X2 - It is the kontrol F2!
According to the video above, the new hardware (Traktor Kontrol F1) will be ready on 1st of April 2012!!!