Changed function names, changed C++0x to C++11