Issue #2323447 by xan_ps: Entity controllers are renamed to handlers