Personally, I would stick all of the flan stuff in under flan, which would handle custard and non-custard flans. A flan is not necessarily a custard and a custard is not necessarily a flan. Bear