Name handling (6/27)

Name handling