renamed service topics to comply with conventions