Clearing up synth errors from wire names/mismatch v2