Rename functions to avoid conflicts