Rename entity controllers to handlers