Adding underscore as word delimiter