Naming adjustments