adjusted the names