Change object names
Correct object names