Another try at removing name dependence