Fixed wrong naming and adapted StorageFactoryService.