Minor cleanup related to rename