Refactoring of storage namings
Refactoring and renaming of modules