Fix service identifiers and prefixes in manifest