refactor to use consistent namespace