Significance: minor
Type: update

Update current block names to reflect use case and avoid conflicts#37704