Name handling (8/27)

Name handling