Revert "renamed storageType to type"

This reverts commit 315dfecd56d6588bc8aa412925615e363667a9eb.