naming clean up and minor fixes