rename and minor fixes