Added ResourceNameTrait
Revert "Added ResourceNameTrait"

This reverts commit d3e673d76c13b7dc50ce48d723f74bcea0dff6ae.
Added ResourceNameTrait