Rename and minor rivision