Fixed 'Bug 11713 - Rename file to match type should only be checked in
some cases'.