[c++ engine] renamed some stuff;