Revert "Remove prefix (__) of refactored function for correct importing on the other modules"

This reverts commit ed638ecda99e1da0d4cfd37a92f95855f9813bac.