More action cleanup and scene rename fixes