Handle entity routing via event listener
Rename interfaces