Fixed indentation problems resulting from automatic renaming, other