Revert "Todo rename"

This reverts commit af156a57911ba2cb0fe147a55b6150ab09122ec7.
Testportlets fix