Some renames in run.c