Renamed namespace and calls within all classes to MattKirwan