Change object names in functions