Better subPage template names

This eliminates the silly subPagePage name and describes the button
templates as such.