updating naming convention for handlers