Rename two functions
Rename two functions
Fix bugs