Rename some variables
Remove an entity from the map after a deletion