Rename class, fix bugs in processing instruction parameters.