Fixed timeout names.

Fixing part of issue #7. Do not close it, it's not fully solved yet.