Renamed definitionScope fields to localScope