More generic mapping name. Dvorak include