Renaming for consistent case (#1).
Renaming for consistent case (#2).