PIM-2588: minor fixes

That's a BC Break.
You should keep the previous method and mark it as deprecated (to remove in 1.3)