fix internal names to be namspaced properly;