Small updates for C and C++ codebases

Fixed small errors which caused uncompilable code. I also suggest that C and C++ sources should have the same name.