Added name trimming.