I once needed new die holders for the thread cutting dies. I found what I was looking for at the Czech company Kinex. There was also a dial caliper.
https://www.kinexmeasuring.com/de/I have been using the company's tap wrenches for a few years now.
I labelled the tap wrenches with my first logo.