More name shortening in manifests