Consolidate timeout var names