Update function names and data attributes