Add support for hyphens in generator names