Added missing renamings
Towards an implementation of records and variant types