Use new utils
Consistent naming for points