Index: src/molecule_fragmentation.cpp
===================================================================
--- src/molecule_fragmentation.cpp	(revision 735b1c1514f0f9ac27c1a3ef683b9fa6ea2cf010)
+++ src/molecule_fragmentation.cpp	(revision 5309ba2259d81aba279e4520a5ebc51c898d8b75)
@@ -351,5 +351,5 @@
 
   if (CountLinesinFile(InputFile) > 0) {
-    // each line represents a fragment root (Atom::ParticleInfo_nr) id and its energy contribution
+    // each line represents a fragment root (Atom::Nr) id and its energy contribution
     InputFile.getline(buffer, MAXSTRINGSIZE); // skip comment lines
     InputFile.getline(buffer, MAXSTRINGSIZE);
@@ -411,5 +411,5 @@
  * Picks a given number of highest values and set *AtomMask to true.
  * \param *out output stream for debugging
- * \param *AtomMask defines true/false per global Atom::ParticleInfo_nr to mask in/out each nuclear site, used to activate given number of site to increment order adaptively
+ * \param *AtomMask defines true/false per global Atom::Nr to mask in/out each nuclear site, used to activate given number of site to increment order adaptively
  * \param FinalRootCandidates list candidates to check
  * \param Order desired order
@@ -437,5 +437,5 @@
 /** print atom mask for debugging.
  * \param *out output stream for debugging
- * \param *AtomMask defines true/false per global Atom::ParticleInfo_nr to mask in/out each nuclear site, used to activate given number of site to increment order adaptively
+ * \param *AtomMask defines true/false per global Atom::Nr to mask in/out each nuclear site, used to activate given number of site to increment order adaptively
  * \param AtomCount number of entries in \a *AtomMask
  */
@@ -453,5 +453,5 @@
 
 /** Checks whether the OrderAtSite is still below \a Order at some site.
- * \param *AtomMask defines true/false per global Atom::ParticleInfo_nr to mask in/out each nuclear site, used to activate given number of site to increment order adaptively
+ * \param *AtomMask defines true/false per global Atom::Nr to mask in/out each nuclear site, used to activate given number of site to increment order adaptively
  * \param *GlobalKeySetList list of keysets with global ids (valid in "this" molecule) needed for adaptive increase
  * \param Order desired Order if positive, desired exponent in threshold criteria if negative (0 is single-step)
@@ -574,5 +574,5 @@
   // count them
   if (count == 0) {
-    for (molecule::iterator iter = begin(); iter != end(); ++iter) { // create a lookup table (Atom::ParticleInfo_nr -> atom) used as a marker table lateron
+    for (molecule::iterator iter = begin(); iter != end(); ++iter) { // create a lookup table (Atom::Nr -> atom) used as a marker table lateron
       count = (count < (*iter)->GetTrueFather()->getNr()) ? (*iter)->GetTrueFather()->getNr() : count;
     }
@@ -655,5 +655,5 @@
   // ===== 1. Check whether bond structure is same as stored in files ====
 
-  // create lookup table for Atom::ParticleInfo_nr
+  // create lookup table for Atom::Nr
   FragmentationToDo = FragmentationToDo && CreateFatherLookupTable(ListOfAtoms, getAtomCount());
 
@@ -854,5 +854,5 @@
 
 
-/** Stores pairs (Atom::ParticleInfo_nr, Atom::AdaptiveOrder) into file.
+/** Stores pairs (Atom::Nr, Atom::AdaptiveOrder) into file.
  * Atoms not present in the file get "-1".
  * \param &path path to file ORDERATSITEFILE
@@ -878,5 +878,5 @@
 };
 
-/** Parses pairs(Atom::ParticleInfo_nr, Atom::AdaptiveOrder) from file and stores in molecule's Atom's.
+/** Parses pairs(Atom::Nr, Atom::AdaptiveOrder) from file and stores in molecule's Atom's.
  * Atoms not present in the file get "0".
  * \param &path path to file ORDERATSITEFILEe
@@ -1018,5 +1018,5 @@
         if (SonList[OtherFather->getNr()] != NULL) {
 //          Log() << Verbose(0) << ", whose son is " << *SonList[OtherFather->getNr()] << "." << endl;
-          if (OtherFather->getNr() > FatherOfRunner->getNr()) { // add bond (ParticleInfo_nr check is for adding only one of both variants: ab, ba)
+          if (OtherFather->getNr() > FatherOfRunner->getNr()) { // add bond (Nr check is for adding only one of both variants: ab, ba)
 //            Log() << Verbose(3) << "Adding Bond: ";
 //            Log() << Verbose(0) <<
