[storm_on_demand] Add more underscores to 'stormondemand' where needed