Get rid of PlaceHolderNames class