add naive controller & change names