Added "namespace" attribute for fields

Change-Id: Ifae9f942849342a4df0965766b38be310722e03d