Starting renaming process.
Refactor complete (?).

I’m not sure this was a smart idea, but things *seem* to work… for now.
Tests? What tests?
Oops.
Fixed test app storyboard.