Disabiguate some keys