some updates in the names and comments