Made names and events more consistent.