Changed ndef's so they read THISCLASSNAME_CPP, working on tbst