Merge "Fixed wrong identifier name and valueType string constants"