This diff is a fix.
After updating the field names to use ID instead of Id some of the fields used the old names which caused errors while running in the cloud. The codebase is already
using the ID pattern. The changes need to be made in the Terraform script.
Linear task: ENG-1492