Name handling (4/27)

Name handling