OPAL-2210 - removed the word import and export, made the usage ONLY storage