Nomenclature schemes implemented for various class members. No change in algorithm. Tested in both MC and SE modes. Some redundancies removed from CKM class. Needs further cleaning.