Fixed problems with column naming.