renames variables sanely