add namespace, change names