AVALANCHE: Some more renaming in Timeout. Add some Doxygen comments