multiple identities and user names for one admin

I upgraded from OS 10.11 (El Capitan) to OS 10.13 (High Sierra). 

In El Capitan, my user name was Jane Doe; it had my personal picture attached. My user folder was janedoe; it had the house icon. 

I don’t know if I misinterpreted the instructions during set up, but now I’ve somehow ended up with two Admin identities and 3 users:

System Prefs > Users & Groups

• JaneD (Admin) - has my personal picture from El Capitan. During the upgrade I was prompted to enter a new user name, so I typed JaneD
• Jane Doe (Admin) - has a picture that looks like HAL from 2001: A Space Odyssey. This was created during the upgrade.

Users folder contains these users:

• janed - standard folder icon: contains one item, a Library folder with one Adobe preference file in it
• janedoe - standard folder icon: this was created during the upgrade; it contains the 7 standard user folders (desktop, documents, etc.; all have lock icons attached)
• janedoe 1 - house icon (contains all my previous home folders from El Capitan: my desktop, downloads, documents, etc.). During the upgrade, I was prompted for a name to contain all my previous home folder items, so I typed janedoe 1 

When I sign in as JaneD, I have access to everything in janedoe 1 (which is good; everything I need and use is in janedoe 1)

QUESTIONS: 

Can I delete Jane Doe (the new one created during the upgrade) from Users & Groups? Will this automatically delete the janedoe user folder (the one with the locked folders which I don’t use)?

If that can be done, is there a way to end up with one user name Jane Doe and one user folder janedoe (a folder that contains everything that janedoe 1 now has)?