[SceneNameResolver] Fix them Big Bros

This is just a change I made on my version (which helped me discover the problems with the SceneNameResolver that I fixed with my pull requests)