Resource usage names updates and HP wf updated...

... with these to control resource usage in a more fine grained way.