Remove 'sep' arguments
Modify object names throughout