Fix references to original implementation