more adjustments to the naming convention