rename and reorder functions per usage

[etnbrd]

Closing in favor of https://github.com/DataDog/terraform-provider-datadog/pull/2527