changing some names to avoid naming collisions