Revert aggressive renaming; add check to make sure connect doesn't rewrite _original_name