Add @chris to conflicting names