Refector the names of core interfaces
dealing with some conflicts