class insertion handles namespace separators now