Tidy up Wallet Name Display

[JamesSmartCell]

• Fix some related legacy code issues.
• Tidy up wallet naming

[github-actions[bot]]

Pull reviewers stats

Stats of the last 30 days for alpha-wallet-android:		User	Total reviews	Time to review	Total comments

^{⚡️ Pull request stats}