Remove Bifrost as name - we're independent from that!
Changed Namespaces to be correct.