naming convention adjustments