One account, two users?

I wanted to rename my short name, so I went to the Account section in System Preferences. Afterwards, I right-clicked my account to show the advanced preferences. I changed my short name then reset (a BAD idea in retrospect).
Now, I have two folders in my Users folder, but only one account exists. I have tried to use Time Machine to do a quick restore, but it doesn't seem to want to restore an account onto itself. Is there a way to delete my new user and restore everything back to the way it was before?
Thanks!

EDIT: All I had to do was to undo my changes (DUH!).

just go into accounts again, click the lock at the bottom of the window and enter your password, select the account that you want to get rid of, and click the "-" under the window.
If it's just an empty folder that you want to get rid of.... just drag it off the side bar of the finder window, and then go into users, and if that folder exists there, trash it.

wing0custom8 said:

All I had to do was to undo my changes (DUH!).

Click to expand...

Really? An Undo command in System Preferences > Accounts, or where?

I see Undo grayed out in mine, but I didn't do anything to undo!