TODO tasks pointing to wrong object types

TODO tasks pointing to wrong object types in attributes and methods doc.