Refactor resource name