Removed namespace Types. Template parameter names made more consistent.