change default take-name
remove cruft