Cleanup names

cleanup names; fix name mapping error