Replace "r" variables with "x" variables for a consistent coordinate
scheme.