Cleaned up the storage named setter.