Added workarounds for name clashing in generated messages