Description
Two semantically identical constant Block.BLOCK_FILE_PREFIX and DataStorage.BLOCK_FILE_PREFIX should merged into one. Should be defined in Block, imo.
Also use cases of "blok_", like in DirectoryScanner should be replaced by the this constant.