Changing topic name plus Doc string modifications

Change-Id: Id99872c2e1be2fdc81a9ce41d49af3ad4ab51f46