updated topic naming to be consistent