Minor renaming cleanup