Adjust namespace inline with current thoughts