Updating method names and exports