Rename tmp_base a bit more