Need to consistently strip the names