more modifications for future cints with correct namespace handling