Issue #3090 update rename for consistency