diff --git a/healthcheck/healthcheck.go b/health/client.go
similarity index 96%
rename from healthcheck/healthcheck.go
rename to health/client.go
index c6f5ac00..aa123e4e 100644
--- a/healthcheck/healthcheck.go
+++ b/health/client.go
@@ -16,9 +16,7 @@
  *
  */
 
-// Package healthcheck enables support for grpc health checking.  It is
-// EXPERIMENTAL.
-package healthcheck
+package health
 
 import (
 	"fmt"
diff --git a/healthcheck/healthcheck_test.go b/health/client_test.go
similarity index 98%
rename from healthcheck/healthcheck_test.go
rename to health/client_test.go
index 8fb88b1e..8c2d5c10 100644
--- a/healthcheck/healthcheck_test.go
+++ b/health/client_test.go
@@ -16,7 +16,7 @@
  *
  */
 
-package healthcheck
+package health
 
 import (
 	"errors"
diff --git a/health/health.go b/health/server.go
similarity index 95%
rename from health/health.go
rename to health/server.go
index 10666f2d..eebecccf 100644
--- a/health/health.go
+++ b/health/server.go
@@ -18,8 +18,8 @@
 
 //go:generate ./regenerate.sh
 
-// Package health provides some utility functions to health-check a server. The implementation
-// is based on protobuf. Users need to write their own implementations if other IDLs are used.
+// Package health provides a service that exposes server's health and it must be
+// imported to enable support for client-side health checks.
 package health
 
 import (
diff --git a/health/health_test.go b/health/server_test.go
similarity index 99%
rename from health/health_test.go
rename to health/server_test.go
index 0ad6876c..308b54a5 100644
--- a/health/health_test.go
+++ b/health/server_test.go
@@ -15,6 +15,7 @@
  * limitations under the License.
  *
  */
+
 package health_test
 
 import (