Fix key prefixes