Minor rename / comment updates to CollisionSystem logic