new naming, updates to storage