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