I suspect this definition issue is partially due to cultural issues - freedom means different things in different parts of the world. Outside of the US societal freedom and the freedom from pain are valued over the individualistic freedom valued in the US.

I don't think either view is absolutely correct after having lived in a few different' societies - but there are valid points to support a view where individual freedom to act isn't the primary freedom to protect (i.e. protecting the freedom for everyone to live a healthy life better enables all individuals to achieve a greater degree of freedom as a society than being individually focused).

I really think there's a philosophical disagreement on what freedom is at the core of a lot of the libertarian vs. socialist arguments.