Rename and add badge