mapping-manager: Rename inner_error to error when appropriate

It only makes sense to have it named inner_error when there's already a "error" variable, that is, when the functions takes it as argument. In the cases covered in this commit, the function doesn't take any "error" argument so it's safe and better to rename those inner_error.

Bringing back some commits from !32 (closed)