Resolves issue with overriding Burner.System.
Renames storm to debris, vortex to runner; updates tests.