Add TODOs for incorrectly referenced class properties

Change-Id: If3d4bbe9d800a3f44b24f223fb88ca1c48d0ffb5