Changed the scope names to better match their style and location.