PS Vita Remote Play (PS4 version) buttons wrong

If you're using remote play the PS4 version has reversed buttons - the X and O buttons are swapped. If you get used to it it's fine but it's a total pain going back and forth between the PS Vita (remote play) and the PS4 (and even worse, the PS3 version for non-beta play).

Please fix! :)

You can change this in System Configuration > Button configuration. I swapped X and O around as I was/used to play on Xbox360 A and B.

I played on my PS Vita and the buttons are fine - although it was after I have changed the PS4 buttons mapping first.