Revert "Renamining of the controller"

This reverts commit 93bef88e09e01471b47394f575b29d3af553d735.