Fix bad namings

Fix bad naming

Fix bad namings