Do you distinguish between different types of risk, e.g. liquidity, volatility, diversification?

In short, yes.

In addition to Risk Tolerance (i.e. an individual's attitude to long-term uncertainty), we pick up on emotional reactions to volatility via questions on Composure, liquidity through Risk Capacity, and can use additional Behavioural Capacity dimensions to measure numerous other aspects of investment solutions on which investor preferences differ.