generator with --skip_namespace option names fixed.