name cleanup
Fix #69