Update reserved words to be a nested struct.