Fix name overloading
Improve timeout handling
Tweak messages