Modify naming and clean up scene a little.