Remap to shorter keys