Minor rename updates