Renamed class that left bad taste in mouth
Major cleanup; please keep this PEP8 complient.