Indeed. "classical liberal" is the only way I use "liberal", though I'll only use the term at all if I'm actually discussing political philosophy.

Also, one's political philosophy is not necessarily isomorphic to one's ethics. The questions "Should I be a libertarian", "How should we arrange political institutions", and "How should I feel about other people telling me what to do" are all ethical questions, but their answers are far more complex than finding something that 'matches' one's ethics.