[TASK] Rename CLI controller again