Rename controllers according to core changes in #2200867
Merge pull request #90 from cs-shadow/fix-test-failres

Rename controllers according to core changes in #2200867