It doesn't matter which way you go, as long as both brakes on that axle are of the same brand. There is indeed just a single pad now.

There are still different rebuild kits, if you rebuild them.

Both brands are fairly easily available as rebuilds from places like O'Reilly or various online shops.