Update function names for more compatibility