Non-functional update: Refactor Storage Policy names