rename listener with subscriber when appropriate
cs
use the event system to map fields