Adjusted names according to our scenario

Adjusted names, resources and actions according to our scenario