Updated resources and tests for rename