[DO NOT REVIEW] Fixes #8583 - Renaming id attribute to avoid lookup