diff --git a/p/GPLACTORS.m b/p/GPLACTOR.m
similarity index 100%
rename from p/GPLACTORS.m
rename to p/GPLACTOR.m
diff --git a/p/GPLCCD.m b/p/GPLCCD.m
index 5f66509..612ae0e 100644
--- a/p/GPLCCD.m
+++ b/p/GPLCCD.m
@@ -79,7 +79,7 @@ CCDRPC(CCRGRTN,DFN,CCRPART,TIME1,TIME2,HDRARY)  ;RPC ENTRY POINT FOR CCR OUTPUT
     ; MAPPING THE PATIENT PORTION OF THE CDA HEADER
     S ZZX="//ContinuityOfCareRecord/recordTarget/patientRole/patient"
     D QUERY^GPLXPATH(CCDGLO,ZZX,"ACTT1")
-    D PATIENT^GPLACTORS("ACTT1",DFN,"ACTORPATIENT_"_DFN,"ACTT2") ; MAP PATIENT
+    D PATIENT^GPLACTOR("ACTT1",DFN,"ACTORPATIENT_"_DFN,"ACTT2") ; MAP PATIENT
     I DEBUG D PARY^GPLXPATH("ACTT2")
     D REPLACE^GPLXPATH(CCDGLO,"ACTT2",ZZX)
     I DEBUG D PARY^GPLXPATH(CCDGLO)
@@ -139,7 +139,7 @@ INITSTPS(TAB)  ; INITIALIZE CCR PROCESSING STEPS
     ; ORDER FOR CCR IS PROBLEMS,FAMILYHISTORY,SOCIALHISTORY,MEDICATIONS,VITALSIGNS,RESULTS,HEALTHCAREPROVIDERS
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLPROBS;//ContinuityOfCareRecord/Body/Problems;^TMP(""GPLCCR"",$J,DFN,""PROBLEMS"")")
     ;D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
-    I 'CCD D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITALS;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
+    I 'CCD D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITAL;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
     Q
     ;
 SHAVE(SHXML) ; REMOVES THE 2-6 AND N-1 AND N-2 LINES FROM A COMPONENT
@@ -248,7 +248,7 @@ TLIST  ; LIST THE TESTS
  ;;><ACTORS>
  ;;>>>D ZTEST^GPLCCR("ACTLST")
  ;;>>>D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Actors","G2")
- ;;>>>D EXTRACT^GPLACTORS("G2","ACTTEST","G3")
+ ;;>>>D EXTRACT^GPLACTOR("G2","ACTTEST","G3")
  ;;>>?G3(G3(0))["</Actors>"
  ;;><TRIM>
  ;;>>>D ZTEST^GPLCCR("CCR")
diff --git a/p/GPLCCR.m b/p/GPLCCR.m
index 8cadb80..a527a1d 100644
--- a/p/GPLCCR.m
+++ b/p/GPLCCR.m
@@ -99,7 +99,7 @@ CCRRPC(CCRGRTN,DFN,CCRPART,TIME1,TIME2,HDRARY)  ;RPC ENTRY POINT FOR CCR OUTPUT
     . . I DEBUG F GPLI=1:1:@OXML@(0) W @OXML@(GPLI),!
     D ACTLST^GPLCCR(CCRGLO,ACTGLO) ; GEN THE ACTOR LIST
     D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Actors","ACTT")
-    D EXTRACT^GPLACTORS("ACTT",ACTGLO,"ACTT2")
+    D EXTRACT^GPLACTOR("ACTT",ACTGLO,"ACTT2")
     D INSINNER^GPLXPATH(CCRGLO,"ACTT2","//ContinuityOfCareRecord/Actors")
     N TRIMI,J,DONE S DONE=0
     F TRIMI=0:0 D  Q:DONE  ; DELETE UNTIL ALL EMPTY ELEMENTS ARE GONE
@@ -114,7 +114,7 @@ INITSTPS(TAB)  ; INITIALIZE CCR PROCESSING STEPS
     ; ORDER FOR CCR IS PROBLEMS,FAMILYHISTORY,SOCIALHISTORY,MEDICATIONS,VITALSIGNS,RESULTS,HEALTHCAREPROVIDERS
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLPROBS;//ContinuityOfCareRecord/Body/Problems;^TMP(""GPLCCR"",$J,DFN,""PROBLEMS"")")
     D PUSH^GPLXPATH(TAB,"EXTRACT;GPLMEDS;//ContinuityOfCareRecord/Body/Medications;^TMP(""GPLCCR"",$J,DFN,""MEDICATIONS"")")
-    D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITALS;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
+    D PUSH^GPLXPATH(TAB,"EXTRACT;GPLVITAL;//ContinuityOfCareRecord/Body/VitalSigns;^TMP(""GPLCCR"",$J,DFN,""VITALS"")")
     I TESTLAB D PUSH^GPLXPATH(TAB,"EXTRACT;GPLLABS;//ContinuityOfCareRecord/Body/Results;^TMP(""GPLCCR"",$J,DFN,""RESULTS"")")
     Q
     ;
@@ -198,7 +198,7 @@ TLIST  ; LIST THE TESTS
  ;;><ACTORS>
  ;;>>>D ZTEST^GPLCCR("ACTLST")
  ;;>>>D QUERY^GPLXPATH(TGLOBAL,"//ContinuityOfCareRecord/Actors","G2")
- ;;>>>D EXTRACT^GPLACTORS("G2","ACTTEST","G3")
+ ;;>>>D EXTRACT^GPLACTOR("G2","ACTTEST","G3")
  ;;>>?G3(G3(0))["</Actors>"
  ;;><TRIM>
  ;;>>>D ZTEST^GPLCCR("CCR")
diff --git a/p/GPLVITALS.m b/p/GPLVITAL.m
similarity index 100%
rename from p/GPLVITALS.m
rename to p/GPLVITAL.m