remove ' ' in favour of '_'

As required in GFD185