Question: what is the difference between mass nouns and uncountable nouns?
Answer: If you want to distinguish them, you might say that mass nouns are the uncountable nouns that describe substances, whether physical (e.g. wheat) or conceptual (e.g. data), while an uncountable noun isn't a mass noun if it just describes an idea (e.g. justice, in the non-Supreme Court sense).