better handling of potentially mischievous names