Name handling (9/27)

Name handling