Fixed namespace handling.

Change-Id: Ie10c9fef6b178bf0d7e823dc0d929cd0b60d6410