Merge "renaming/constant instead of literal/unused items"