Fix Spacing After Renames