Make names more understandable