Rename StorageLocation... to StorageUsage...