rename service inner objects, remove ugly old DI