Change namespace inline with current moves