Update classes names to be more clear of what they are
Hard code default REST driver