[JBTM-1771] Better RESTAT source directory names