revert back name columns to provide backcompatibility