CChanging paramater building

Changed class names and removed the “with” from the method’s names
Changing paramater building

Changed class names and removed the “with” from the method’s names
Changing paramater building

Changed class names and removed the “with” from the method’s names
Changing paramater building

Changed class names and removed the “with” from the method’s names