Renamed class, and added ref to original source