BZ-10090: update public/private scope variables

Signed-off-by: Paden <padenportillo@gmail.com>