Restore Assignment. Laetitia, don't change anymore!!
Change types to uppercase versions, to be consistent.