Revamping of activators names and namespaces

Not as scary as it looks.