Added timestampQuery/timestamp distinction. Not sure that all the class magic in PName is the way to go in the future...