Bit more naming clean up.