rename + add some transitions