Finalised new storage and naming