Fixed references in manifests to match new naming convention