Revert "1.1 Name and 1.2 Address code refactor"

This reverts commit 4110781e2241245843364a30d8fe04eda6ee645f.