Name handling (2/27)

Name handling