"Liberalism": Broadly, what other countries call social liberalism, i.e. liberty, individual rights, equality, all rooted in Locke's notion of the social contract.
"Libertarianism": An American revival of what's formally called classical liberalism. Broadly: Small government, strong individual rights, free market capitalism, etc.