Fixing Namespace issue

Signed-off-by: nguyenk <k.nguyen@thecodingmachine.com>