Fix demo and identifiers.

* Fix demo issues;
* Made identifiers to fit  C++ language standard.