Fix for issue #1 - tokenise local names into space-separated tokens