Change topic keys to match new naming scheme