Bit of naming clean-up.