Manually merged naming changes.  Broke some things... need to still fix.
Merge branch 'new-architecture' of github.com:alulaq2/ion-ux into new-architecture