Fix

Rename some functions