Remove silly defines for action names.
Namespaces!
More making things work with namespaces.