Fix using the same field name with different types - works, but will confuse decompilers.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>