Remove namespace and use prefixes properly