Minor renaming and cleanup