make names more consistent