partially fix naming problems after splitting out User and Scene