make names consistent