Name handling (7/27)

Name handling