DECUPAS-17 Use namespace properly.