Massive renaming effort - and finished up tests for persistence layer.