added override-clean-name option, improved logging