More consistent naming of util functions