Restore naming behaviour

Spaces are replaced with '_'