Respect new names API