(RAZOR-380) Normalize inconsistencies in attribute names