Reworded some c++ entities