Naming consistency, replace-p-nodes -> replace-ps