some changes in context data type names