Fixed c++ like varible names.