Make names more consistent.