Updated namespaces so I can use this fork safely