Add namespaces to generated code

Change-Id: Id7b9916ab1a5d4a10a15dfbbc40949582fa05181