diff --git a/make/makefile b/make/makefile
index 30add0c9a0a..d7cd48b0d2b 100644
--- a/make/makefile
+++ b/make/makefile
@@ -109,10 +109,10 @@ $(OBJDIR)/swf-cxsidm.o \
 $(OBJDIR)/swf-chdidm.o \
 $(OBJDIR)/simtdisidm.o \
 $(OBJDIR)/sim-namidm.o \
-$(OBJDIR)/prt1idm.o \
-$(OBJDIR)/prt1mip1idm.o \
-$(OBJDIR)/prt1disv1idm.o \
-$(OBJDIR)/prt1dis1idm.o \
+$(OBJDIR)/prt-namidm.o \
+$(OBJDIR)/prt-mipidm.o \
+$(OBJDIR)/prt-disvidm.o \
+$(OBJDIR)/prt-disidm.o \
 $(OBJDIR)/gwt-namidm.o \
 $(OBJDIR)/gwt-icidm.o \
 $(OBJDIR)/gwt-dspidm.o \
@@ -144,7 +144,7 @@ $(OBJDIR)/gwe-ctpidm.o \
 $(OBJDIR)/gwe-cndidm.o \
 $(OBJDIR)/exg-swfgwfidm.o \
 $(OBJDIR)/exg-gwtgwtidm.o \
-$(OBJDIR)/gwfprtidm.o \
+$(OBJDIR)/exg-gwfprtidm.o \
 $(OBJDIR)/exg-gwfgwtidm.o \
 $(OBJDIR)/exg-gwfgwfidm.o \
 $(OBJDIR)/exg-gwfgweidm.o \
@@ -209,7 +209,7 @@ $(OBJDIR)/FlowModelInterface.o \
 $(OBJDIR)/Subcell.o \
 $(OBJDIR)/TrackData.o \
 $(OBJDIR)/TimeSelect.o \
-$(OBJDIR)/prt1fmi1.o \
+$(OBJDIR)/prt-fmi.o \
 $(OBJDIR)/Cell.o \
 $(OBJDIR)/sort.o \
 $(OBJDIR)/SfrCrossSectionUtils.o \
@@ -370,10 +370,10 @@ $(OBJDIR)/swf-oc.o \
 $(OBJDIR)/swf-obs.o \
 $(OBJDIR)/swf-flw.o \
 $(OBJDIR)/swf-dfw.o \
-$(OBJDIR)/prt1prp1.o \
-$(OBJDIR)/prt1oc1.o \
-$(OBJDIR)/prt1obs1.o \
-$(OBJDIR)/prt1mip.o \
+$(OBJDIR)/prt-prp.o \
+$(OBJDIR)/prt-oc.o \
+$(OBJDIR)/prt-obs.o \
+$(OBJDIR)/prt-mip.o \
 $(OBJDIR)/MethodPool.o \
 $(OBJDIR)/SpatialModelConnection.o \
 $(OBJDIR)/GwtInterfaceModel.o \
@@ -389,7 +389,7 @@ $(OBJDIR)/StressListInput.o \
 $(OBJDIR)/StressGridInput.o \
 $(OBJDIR)/LoadMf6File.o \
 $(OBJDIR)/swf.o \
-$(OBJDIR)/prt1.o \
+$(OBJDIR)/prt.o \
 $(OBJDIR)/ExplicitSolution.o \
 $(OBJDIR)/GwtGwtConnection.o \
 $(OBJDIR)/GwfGwfConnection.o \
@@ -407,7 +407,7 @@ $(OBJDIR)/VirtualGweExchange.o \
 $(OBJDIR)/exg-swfgwf.o \
 $(OBJDIR)/SolutionGroup.o \
 $(OBJDIR)/SolutionFactory.o \
-$(OBJDIR)/GwfPrtExchange.o \
+$(OBJDIR)/exg-gwfprt.o \
 $(OBJDIR)/exg-gwfgwt.o \
 $(OBJDIR)/exg-gwfgwe.o \
 $(OBJDIR)/RunControl.o \
diff --git a/msvs/mf6core.vfproj b/msvs/mf6core.vfproj
index ea6a91a38c6..a41cf4f6748 100644
--- a/msvs/mf6core.vfproj
+++ b/msvs/mf6core.vfproj
@@ -104,16 +104,12 @@
 		<File RelativePath="..\src\Distributed\VirtualModel.f90"/>
 		<File RelativePath="..\src\Distributed\VirtualSolution.f90"/></Filter>
 		<Filter Name="Exchange">
-		<File RelativePath="..\src\Exchange\gwfgwfidm.f90"/>
-		<File RelativePath="..\src\Exchange\gwfgwtidm.f90"/>
-		<File RelativePath="..\src\Exchange\gwtgwtidm.f90"/>
-		<File RelativePath="..\src\Exchange\gwfprtidm.f90"/>
 		<File RelativePath="..\src\Exchange\BaseExchange.f90"/>
 		<File RelativePath="..\src\Exchange\DisConnExchange.f90"/>
 		<File RelativePath="..\src\Exchange\GhostNode.f90"/>
+		<File RelativePath="..\src\Exchange\GwfExchangeMover.f90"/>
 		<File RelativePath="..\src\Exchange\exg-gwegwe.f90"/>
 		<File RelativePath="..\src\Exchange\exg-gwegweidm.f90"/>
-		<File RelativePath="..\src\Exchange\GwfExchangeMover.f90"/>
 		<File RelativePath="..\src\Exchange\exg-gwfgwe.f90"/>
 		<File RelativePath="..\src\Exchange\exg-gwfgweidm.f90"/>
 		<File RelativePath="..\src\Exchange\exg-gwfgwf.f90"/>
@@ -124,8 +120,9 @@
 		<File RelativePath="..\src\Exchange\exg-gwtgwtidm.f90"/>
 		<File RelativePath="..\src\Exchange\exg-swfgwf.f90"/>
 		<File RelativePath="..\src\Exchange\exg-swfgwfidm.f90"/>
+		<File RelativePath="..\src\Exchange\exg-gwfprt.f90"/>
+		<File RelativePath="..\src\Exchange\exg-gwfprtidm.f90"/>
 		<File RelativePath="..\src\Exchange\NumericalExchange.f90"/></Filter>
-		<File RelativePath="..\src\Exchange\GwfPrtExchange.f90"/>
 		<Filter Name="Model">
 		<Filter Name="Connection">
 		<File RelativePath="..\src\Model\Connection\CellWithNbrs.f90"/>
@@ -246,6 +243,18 @@
 		<File RelativePath="..\src\Model\SurfaceWaterFlow\swf-zdg.f90"/>
 		<File RelativePath="..\src\Model\SurfaceWaterFlow\swf-zdgidm.f90"/>
 		</Filter>
+		<Filter Name="ParticleTracking">
+		<File RelativePath="..\src\Model\ParticleTracking\prt.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-namidm.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-fmi.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-mip.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-obs.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-oc.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-prp.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-disidm.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-disvidm.f90"/>
+		<File RelativePath="..\src\Model\ParticleTracking\prt-mipidm.f90"/>
+		</Filter>
 		<Filter Name="ModelUtilities">
 		<File RelativePath="..\src\Model\ModelUtilities\BoundaryPackage.f90"/>
 		<File RelativePath="..\src\Model\ModelUtilities\BoundaryPackageExt.f90"/>
@@ -289,18 +298,6 @@
 		<File RelativePath="..\src\Model\ExplicitModel.f90"/>
 		<File RelativePath="..\src\Model\NumericalModel.f90"/>
 		<File RelativePath="..\src\Model\NumericalPackage.f90"/></Filter>
-		<Filter Name="ParticleTracking">
-		<File RelativePath="..\src\Model\ParticleTracking\prt1.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1idm.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1fmi1.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1mip.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1obs1.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1oc1.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1prp1.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1dis1idm.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1disv1idm.f90"/>
-		<File RelativePath="..\src\Model\ParticleTracking\prt1mip1idm.f90"/>
-		</Filter>
 		<Filter Name="Solution">
 		<Filter Name="LinearMethods">
 		<File RelativePath="..\src\Solution\LinearMethods\ImsLinearBase.f90"/>
diff --git a/src/Exchange/GwfPrtExchange.f90 b/src/Exchange/exg-gwfprt.f90
similarity index 100%
rename from src/Exchange/GwfPrtExchange.f90
rename to src/Exchange/exg-gwfprt.f90
diff --git a/src/Exchange/gwfprtidm.f90 b/src/Exchange/exg-gwfprtidm.f90
similarity index 100%
rename from src/Exchange/gwfprtidm.f90
rename to src/Exchange/exg-gwfprtidm.f90
diff --git a/src/Model/ParticleTracking/prt1dis1idm.f90 b/src/Model/ParticleTracking/prt-disidm.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1dis1idm.f90
rename to src/Model/ParticleTracking/prt-disidm.f90
diff --git a/src/Model/ParticleTracking/prt1disv1idm.f90 b/src/Model/ParticleTracking/prt-disvidm.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1disv1idm.f90
rename to src/Model/ParticleTracking/prt-disvidm.f90
diff --git a/src/Model/ParticleTracking/prt1fmi1.f90 b/src/Model/ParticleTracking/prt-fmi.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1fmi1.f90
rename to src/Model/ParticleTracking/prt-fmi.f90
diff --git a/src/Model/ParticleTracking/prt1mip.f90 b/src/Model/ParticleTracking/prt-mip.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1mip.f90
rename to src/Model/ParticleTracking/prt-mip.f90
diff --git a/src/Model/ParticleTracking/prt1mip1idm.f90 b/src/Model/ParticleTracking/prt-mipidm.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1mip1idm.f90
rename to src/Model/ParticleTracking/prt-mipidm.f90
diff --git a/src/Model/ParticleTracking/prt1idm.f90 b/src/Model/ParticleTracking/prt-namidm.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1idm.f90
rename to src/Model/ParticleTracking/prt-namidm.f90
diff --git a/src/Model/ParticleTracking/prt1obs1.f90 b/src/Model/ParticleTracking/prt-obs.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1obs1.f90
rename to src/Model/ParticleTracking/prt-obs.f90
diff --git a/src/Model/ParticleTracking/prt1oc1.f90 b/src/Model/ParticleTracking/prt-oc.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1oc1.f90
rename to src/Model/ParticleTracking/prt-oc.f90
diff --git a/src/Model/ParticleTracking/prt1prp1.f90 b/src/Model/ParticleTracking/prt-prp.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1prp1.f90
rename to src/Model/ParticleTracking/prt-prp.f90
diff --git a/src/Model/ParticleTracking/prt1.f90 b/src/Model/ParticleTracking/prt.f90
similarity index 100%
rename from src/Model/ParticleTracking/prt1.f90
rename to src/Model/ParticleTracking/prt.f90
diff --git a/src/meson.build b/src/meson.build
index e31cac1f67b..15dcdf8a377 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -38,17 +38,14 @@ modflow_sources = files(
     'Exchange' / 'exg-gwtgwt.f90',
     'Exchange' / 'exg-gwegwe.f90',
     'Exchange' / 'exg-swfgwf.f90',
-    'Exchange' / 'GwfPrtExchange.f90',
+    'Exchange' / 'exg-gwfprt.f90',
     'Exchange' / 'exg-gwfgwfidm.f90',
     'Exchange' / 'exg-gwfgwtidm.f90',
     'Exchange' / 'exg-gwtgwtidm.f90',
     'Exchange' / 'exg-gwfgweidm.f90',
     'Exchange' / 'exg-gwegweidm.f90',
     'Exchange' / 'exg-swfgwfidm.f90',
-    'Exchange' / 'gwfprtidm.f90',
-    'Exchange' / 'GwfPrtExchange.f90',
-    'Exchange' / 'NumericalExchange.f90',
-    'Exchange' / 'gwfprtidm.f90',
+    'Exchange' / 'exg-gwfprtidm.f90',
     'Model' / 'Connection' / 'ConnectionBuilder.f90',
     'Model' / 'Connection' / 'CellWithNbrs.f90',
     'Model' / 'Connection' / 'CsrUtils.f90',
@@ -160,16 +157,16 @@ modflow_sources = files(
     'Model' / 'SurfaceWaterFlow' / 'swf-sto.f90',
     'Model' / 'SurfaceWaterFlow' / 'swf-zdg.f90',
     'Model' / 'SurfaceWaterFlow' / 'swf-zdgidm.f90',
-    'Model' / 'ParticleTracking' / 'prt1.f90',
-    'Model' / 'ParticleTracking' / 'prt1idm.f90',
-    'Model' / 'ParticleTracking' / 'prt1fmi1.f90',
-    'Model' / 'ParticleTracking' / 'prt1mip.f90',
-    'Model' / 'ParticleTracking' / 'prt1obs1.f90',
-    'Model' / 'ParticleTracking' / 'prt1oc1.f90',
-    'Model' / 'ParticleTracking' / 'prt1prp1.f90',
-    'Model' / 'ParticleTracking' / 'prt1dis1idm.f90',
-    'Model' / 'ParticleTracking' / 'prt1disv1idm.f90',
-    'Model' / 'ParticleTracking' / 'prt1mip1idm.f90',
+    'Model' / 'ParticleTracking' / 'prt.f90',
+    'Model' / 'ParticleTracking' / 'prt-namidm.f90',
+    'Model' / 'ParticleTracking' / 'prt-fmi.f90',
+    'Model' / 'ParticleTracking' / 'prt-mip.f90',
+    'Model' / 'ParticleTracking' / 'prt-obs.f90',
+    'Model' / 'ParticleTracking' / 'prt-oc.f90',
+    'Model' / 'ParticleTracking' / 'prt-prp.f90',
+    'Model' / 'ParticleTracking' / 'prt-disidm.f90',
+    'Model' / 'ParticleTracking' / 'prt-disvidm.f90',
+    'Model' / 'ParticleTracking' / 'prt-mipidm.f90',
     'Model' / 'ModelUtilities' / 'BoundaryPackage.f90',
     'Model' / 'ModelUtilities' / 'BoundaryPackageExt.f90',
     'Model' / 'ModelUtilities' / 'GweCndOptions.f90',