Make names simpler