Minor renaming changes