Try to work around problems with package visibility: use package instead of...

Try to work around problems with package visibility: use package instead of provider in visibility declaration