Whitespace/Name finding issues resolved