Change Storage class name to TaskAndConfigStorage.