Two independent classifications are involved. The first asks relative to which convention an occurrence is literal or figurative. The second asks what relation licenses the departure from the assigned sense.
Convention-based division: lexical, religious, specialized customary, general customary.
Relation-based division: a resemblance-based metaphor or non-resemblance transfer (majāz mursal).
They are not interchangeable. Calling something a “lexical figure” does not yet tell us whether its relation is similarity or another kind of association.