Fix dependency on manifest task
Use more standard objects for Manifest names.