Rename away from storm specific naming