jfltexx: clean up and conform to cm's naming convention