refactor and debug

change unit name for leader and grunt to unit leader and grunt for display more understandable
rename some FK_name that were wrong