Reflect changes in naming of function and data