Enhanced Object naming per Gary's comments