Storage naming fix