Correct unittests for new naming scheme
Server resource to standard naming scheme

Rename tasks and provided attributes to standard sheme.
Update snapshot tasks to correct naming of server attributes and tasks.
Update unittest for server resource type to correct naming.