Define the storage names in a better way for users that also have VO storage