"Query ID can not contain special characters" with generated Data Service Queries

[dbalasse]

I am currently testing WSO2 Data Service.
I created the data service using the "Generate Data Service from Datasource" option and it all went great.
Now I have my dbs file with a bunch of Queries and Resources.
The queries generated have names like this

Now I want to add a default value one of the mapping, so I add it and try to save it.
When I do it I have this message

"Query ID can not contain special characters" which refers to the underscore created by the data service generation. I have tested without the underscore and it is working.

Either the generation service must use only accepted character or editor must support underscore.