Changed Method name from getCanton/setCanton to
getCantonName/setCantonName