Fixing problem with column names that contain the name of their table