Renamed a lot of di configuration instances and aliases. Produced few Data objects.