FULLPIPE: Do some renaming in scene02
FULLPIPE: More work on scene02