Numbered event conversion

Hopefully converted all non-vanilla numbered events to namespaces