Three consecutive three-year terms replace decades-old ordinance