Forgot to rename some functions