tweaking naming and fixing service provider