Renamed unused class to begin with Z