Changed instance names to shapes only