Work on C++, unify variable names across platforms
Signed-off-by: Zeklandia <awood5659@gmail.com>