Improve handling of whitespace in naming strategies #431