Case-preserving fix (moved)
Case-preserving fix (stage two)