Rename home folder to match account name (High Sierra) My home folder name (bob 1) does not match my account name (bob)", but I want it to.

How I got here:


Got a new Mac
Didn't have the cables to transfer from previous Mac, so I just set up a simple test account with my same username "bob"
Once I had the cables I created a new account called "Admin" and then logged in as that account and deleted my previous test user account "bob" in System Preferences.
Migrated data from old Mac.
This resulted in a new account called "bob" but the home folder for that account was named "bob 1". I discovered that my deletion of the test "bob" account had not actually deleted the home folder called "bob".


While logged in as "bob" (which might have been a bad idea) I tried deleting the home folder called "bob" (from terminal) and then editing in System Preferences to change my home folder to "bob". After restart it walked me through the full setup and I realized it created a NEW home folder called "bob", and my old folder was still called "bob 1", except now my account was not associated with that folder (with all my actual data). So... restored from Time Machine.

Now I'd like to do it right. So - 


I have a working account named "bob" that is linked to home folder "bob 1". I don't want to rename the account, just rename the home folder and have my account properly link to it.
I have an orphaned home directory named "bob" that I can delete via Terminal easily enough.
How should I go about renaming the home folder and maintaining (or re-establishing) the association between my user account and the renamed home folder? Or should I just give up and live with "bob 1"...
Per Apple, assuming you're on OS X 10.7 or higher:


Delete the orphaned home directory.
Log out of the account you're renaming, then log in to a different administrator account.
Go to the Users folder on the startup drive. The Users folder contains the home folder of the account you're renaming. Rename that account's home folder.
Choose Apple menu > System Preferences, then click Users &amp; Groups.
Click the lock, then enter the administrator name and password that you used to log in. 
From the list of users, Control-click or right-click the user that you want to rename. Choose Advanced Options from the shortcut menu.
Change the “Home directory” field to match the new name that you gave the home folder in the Users folder.
Click OK, then quit System Preferences.
Restart your Mac.
Log in to the renamed account, then verify that your old files and folders are visible and the account is working as expected.