Another rename to further prevent name clashes