Changed Single and Aggregated classes names to avoid mistakes for the developers. First Release