diff --git a/omaha/omaha.go b/omaha/protocol.go
similarity index 88%
rename from omaha/omaha.go
rename to omaha/protocol.go
index 8e06aef..eb6ddf4 100644
--- a/omaha/omaha.go
+++ b/omaha/protocol.go
@@ -1,10 +1,25 @@
-/*
-   Implements the Google omaha protocol.
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-   Omaha is a request/response protocol using XML. Requests are made by
-   clients and responses are given by the Omaha server.
-   https://github.com/google/omaha/blob/wiki/ServerProtocol.md
-*/
+// Google's Omaha application update protocol, version 3.
+//
+// Omaha is a poll based protocol using XML. Requests are made by clients to
+// check for updates or report events of an update process. Responses are given
+// by the server to provide update information, if any, or to simply
+// acknowledge the receipt of event status.
+//
+// https://github.com/google/omaha/blob/wiki/ServerProtocol.md
 package omaha
 
 import (
@@ -40,8 +55,6 @@ func (r *Request) AddApp(id string, version string) *App {
 	return a
 }
 
-/* Response
- */
 type Response struct {
 	XMLName  xml.Name `xml:"response" datastore:"-" json:"-"`
 	DayStart DayStart `xml:"daystart"`
diff --git a/omaha/omaha_test.go b/omaha/protocol_test.go
similarity index 87%
rename from omaha/omaha_test.go
rename to omaha/protocol_test.go
index c2f14b7..eb6c54c 100644
--- a/omaha/omaha_test.go
+++ b/omaha/protocol_test.go
@@ -1,3 +1,17 @@
+// Copyright 2013-2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package omaha
 
 import (