Add asserts & refactor app storage filenames