make names consistent, reduce measurements