Rename functions to more closely follow example