Rename to resolve conflict

This is the real thing, not some fake.