Name handling (12/27)

Name handling