More naming adjustments