Fix
Rename functions