Scene and Factory triggers get added to storage. Fix labels on new
factory.