I think the second way of fixing this is the better choice (and the places where the class name is hard-coded in should be changed opportunistically).