Rename functions, change scope