Naming adjustments and other small changes