Fix key mangling so it doesn't have a . in it