Change variable names back to old value (were changed during timewarp refactoring)