diff --git a/state/user.go b/state/user.go
index <HASH>..<HASH> 100644
--- a/state/user.go
+++ b/state/user.go
@@ -1,3 +1,6 @@
+// Copyright 2012-2014 Canonical Ltd.
+// Licensed under the AGPLv3, see LICENCE file for details.
+
 package state
 
 import (
diff --git a/worker/uniter/hook/hook.go b/worker/uniter/hook/hook.go
index <HASH>..<HASH> 100644
--- a/worker/uniter/hook/hook.go
+++ b/worker/uniter/hook/hook.go
@@ -44,7 +44,7 @@ func (hi Info) Validate() error {
 	case hooks.Install, hooks.Start, hooks.ConfigChanged, hooks.UpgradeCharm, hooks.Stop, hooks.RelationBroken:
 		return nil
 	case hooks.ActionRequested:
-		if !names.IsAction(hi.ActionId) {
+		if !names.IsValidAction(hi.ActionId) {
 			return fmt.Errorf("action id %q cannot be parsed as an action tag", hi.ActionId)
 		}
 		return nil
s/IsAction/IsValidAction/