Refactoring: Renaming unon, neutron etc. 1. Renaming in comments. Fast test. Stable{msvc-9.0,10.0, gcc-3.4.4}