Changd all types to have NX_ prefix