some minor changes
some namespace fixes
make sure displayname is not null when generating uri