Rename method + clear timeout (issue 7019)