Trim name as well.#2331