More consistent naming and exposed API at module level.