Event argument was missing. Also changed names to make them more
suggestive and less missleading.