Rename and minor fixes