Minor naming clean up.