Update for easy Resource Naming Strategy