rename and fix data len