Change scope syntax to avoid deprecated behavior