Repair name
Rewrite API before its used