Improve mapping names