Fix more map name, fix the type