Did some refactoring on the storage
Corrected naming convention for StorageTypes