Refactoring: better identification between "Question*" and "Date*".

Factorisation will come up later.