Rename events; extend Point