fix some service naming and junk