Fixed prefixes after merge