Large naming refactoring. Added some more tests.
No longer conforming to C# dictionary format. Caught bug in untested persistence system.