Fix namespace impl for changed prefixes