Changing extraction function names