Fix for handling namespace prefix for elements and attributes.
Format comment fix