Name handling (10/27)

Name handling