Small updates to rename and better main