diff --git a/src/geometry.f90 b/src/geometry.f90
index e6a1e2bf50..dbb238fb48 100644
--- a/src/geometry.f90
+++ b/src/geometry.f90
@@ -574,12 +574,12 @@ contains
   end subroutine cross_lattice
 
 !===============================================================================
-! DIST_TO_BOUNDARY calculates the distance to the nearest boundary for a
+! DISTANCE_TO_BOUNDARY calculates the distance to the nearest boundary for a
 ! particle 'p' traveling in a certain direction. For a cell in a subuniverse
 ! that has a parent cell, also include the surfaces of the edge of the universe.
 !===============================================================================
 
-  subroutine dist_to_boundary(p, dist, surf, in_lattice)
+  subroutine distance_to_boundary(p, dist, surf, in_lattice)
 
     type(Particle), pointer     :: p
     real(8),        intent(out) :: dist
@@ -975,7 +975,7 @@ contains
     ! deallocate expression
     deallocate(expression)
 
-  end subroutine dist_to_boundary
+  end subroutine distance_to_boundary
 
 !===============================================================================
 ! SENSE determines whether a point is on the 'positive' or 'negative' side of a
diff --git a/src/physics.f90 b/src/physics.f90
index 9e1b8d03bd..420d0f4a2c 100644
--- a/src/physics.f90
+++ b/src/physics.f90
@@ -5,8 +5,8 @@ module physics
   use endf,                 only: reaction_name, is_fission, is_scatter
   use error,                only: fatal_error, warning
   use fission,              only: nu_total, nu_prompt, nu_delayed
-  use geometry,             only: find_cell, dist_to_boundary, cross_surface, &
-                                  cross_lattice
+  use geometry,             only: find_cell, distance_to_boundary,              &
+                                  cross_surface, cross_lattice
   use geometry_header,      only: Universe, BASE_UNIVERSE
   use global
   use interpolation,        only: interpolate_tab1
@@ -32,8 +32,8 @@ contains
     integer        :: surf           ! surface which particle is on
     integer        :: last_cell      ! most recent cell particle was in
     integer        :: n_event        ! number of collisions/crossings
-    real(8)        :: d_to_boundary  ! distance to nearest boundary
-    real(8)        :: d_to_collision ! sampled distance to collision
+    real(8)        :: d_boundary     ! distance to nearest boundary
+    real(8)        :: d_collision    ! sampled distance to collision
     real(8)        :: distance       ! distance particle travels
     logical        :: found_cell     ! found cell which particle is in?
     logical        :: in_lattice     ! is surface crossing in lattice?
@@ -74,19 +74,19 @@ contains
        call calculate_xs(p)
 
        ! Find the distance to the nearest boundary
-       call dist_to_boundary(p, d_to_boundary, surf, in_lattice)
+       call distance_to_boundary(p, d_boundary, surf, in_lattice)
 
        ! Sample a distance to collision
-       d_to_collision = -log(prn()) / material_xs % total
+       d_collision = -log(prn()) / material_xs % total
        
        ! Select smaller of the two distances
-       distance = min(d_to_boundary, d_to_collision)
+       distance = min(d_boundary, d_collision)
 
        ! Advance particle
        p % xyz       = p % xyz       + distance * p % uvw
        p % xyz_local = p % xyz_local + distance * p % uvw
 
-       if (d_to_collision > d_to_boundary) then
+       if (d_collision > d_boundary) then
           last_cell = p % cell
           p % cell = 0
           if (in_lattice) then
diff --git a/src/plot.f90 b/src/plot.f90
index b8cd12baeb..41cc72668a 100644
--- a/src/plot.f90
+++ b/src/plot.f90
@@ -2,7 +2,7 @@ module plot
 
   use constants
   use error,           only: fatal_error
-  use geometry,        only: find_cell, dist_to_boundary, cross_surface, &
+  use geometry,        only: find_cell, distance_to_boundary, cross_surface, &
                              cross_lattice, cell_contains
   use geometry_header, only: Universe, BASE_UNIVERSE
   use global
@@ -82,7 +82,7 @@ contains
              p % cell = univ % cells(i)
 
              distance = INFINITY
-             call dist_to_boundary(p, d, surf, in_lattice)
+             call distance_to_boundary(p, d, surf, in_lattice)
              if (d < distance) then
                 ! Move particle forward to next surface
                 p % xyz = p % xyz + d * p % uvw
@@ -133,7 +133,7 @@ contains
        do while (p % alive)
 
           ! Calculate distance to next boundary
-          call dist_to_boundary(p, distance, surf, in_lattice)
+          call distance_to_boundary(p, distance, surf, in_lattice)
 
           ! Advance particle
           p%xyz = p%xyz + distance * p%uvw