Changed naming conventions for the incoming message handlers.

AFDP-92