As of now - redefine and fix the naming of constructs. Double-check the interpretation of those constructs based upon the textual data.