Name handling (5/27)

Name handling