Use Name and Type (capitalized) to avoid problems with constructors
Merge local with Github