Changed object names for clarity