Fixing as suggested in bug 2626, made naming same for both C, C++ and python API
Merge pull request #2733 from StevenPuttemans:bug_2162