Add name handling.
Merge branch 'name'
Fix debugging text.