Object naming improved.