Changed message names to better reflect behavior