Made event, functions, and time packages line up with coding conventions