[TASK] Use xmlns declarations