Make names more descriptive