Fixed more potential field name clashes