fixed for naming error and scene ordering