diff --git a/providers/dns/googlecloud/googlecloud.go b/providers/dns/googlecloud/googlecloud.go
index fb8d63d2..0933a881 100644
--- a/providers/dns/googlecloud/googlecloud.go
+++ b/providers/dns/googlecloud/googlecloud.go
@@ -107,6 +107,8 @@ func (c *DNSProvider) CleanUp(domain, token, keyAuth string) error {
 	return nil
 }
 
+// Timeout customizes the timeout values used by the ACME package for checking
+// DNS record validity.
 func (c *DNSProvider) Timeout() (timeout, interval time.Duration) {
 	return 180 * time.Second, 5 * time.Second
 }
diff --git a/providers/dns/namecheap/namecheap.go b/providers/dns/namecheap/namecheap.go
index ab106598..dea75b65 100644
--- a/providers/dns/namecheap/namecheap.go
+++ b/providers/dns/namecheap/namecheap.go
@@ -31,7 +31,7 @@ import (
 var (
 	debug          = false
 	defaultBaseURL = "https://api.namecheap.com/xml.response"
-	getIpURL       = "https://dynamicdns.park-your-domain.com/getip"
+	getIPURL       = "https://dynamicdns.park-your-domain.com/getip"
 	httpClient     = http.Client{Timeout: 60 * time.Second}
 )
 
@@ -68,7 +68,7 @@ func NewDNSProvider(apiUser, apiKey string) (*DNSProvider, error) {
 	}, nil
 }
 
-// Namecheap can sometimes take a long time to complete an update, so wait
+// Timeout : Namecheap can sometimes take a long time to complete an update, so wait
 // up to 60 minutes for the update to propagate.
 func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
 	return 60 * time.Minute, 15 * time.Second
@@ -94,7 +94,7 @@ type apierror struct {
 // getClientIP returns the client's public IP address. It uses namecheap's
 // IP discovery service to perform the lookup.
 func getClientIP() (addr string, err error) {
-	resp, err := httpClient.Get(getIpURL)
+	resp, err := httpClient.Get(getIPURL)
 	if err != nil {
 		return "", err
 	}
diff --git a/providers/dns/namecheap/namecheap_test.go b/providers/dns/namecheap/namecheap_test.go
index 6f24e855..a28070e7 100644
--- a/providers/dns/namecheap/namecheap_test.go
+++ b/providers/dns/namecheap/namecheap_test.go
@@ -271,7 +271,7 @@ type testcase struct {
 	setHostsResponse string
 }
 
-var testcases []testcase = []testcase{
+var testcases = []testcase{
 	{
 		"Test:Success:1",
 		"test.example.com",
@@ -374,7 +374,7 @@ var responseSetHostsSuccess2 = `<?xml version="1.0" encoding="utf-8"?>
   <ExecutionTime>2.347</ExecutionTime>
 </ApiResponse>`
 
-var responseGetHostsErrorBadApiKey1 = `<?xml version="1.0" encoding="utf-8"?>
+var responseGetHostsErrorBadAPIKey1 = `<?xml version="1.0" encoding="utf-8"?>
 <ApiResponse Status="ERROR" xmlns="http://api.namecheap.com/xml.response">
   <Errors>
     <Error Number="1011102">API Key is invalid or API access has not been enabled</Error>