I mean the scope (intent) of this PR isn't to fix the inconsistency in the attr definitions but to use them correctly.