Improve mapping names (#97)