Rename functions to those from the specification