Alternative solutions to the problem also very welcome. I haven't been able to find anything that solves the naming disparity.