Name handling (11/27)

Name handling