Remove transition
Update names to match new schema