fixing merge issue that introduced old feature naming scheme.