diff --git a/plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt_test.go b/plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt_test.go
index 7348585f8..68d51d2ae 100644
--- a/plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt_test.go
+++ b/plugins/inputs/cisco_telemetry_mdt/cisco_telemetry_mdt_test.go
@@ -830,52 +830,52 @@ func TestHandleNXDMESubtree(t *testing.T) {
 	// error is expected since we are passing in dummy transport
 	require.Error(t, err)
 
-	telemetry := &telemetryBis.Telemetry{
+	tel := &telemetry.Telemetry{
 		MsgTimestamp: 1543236572000,
 		EncodingPath: "sys/dme",
-		NodeId:       &telemetryBis.Telemetry_NodeIdStr{NodeIdStr: "hostname"},
-		Subscription: &telemetryBis.Telemetry_SubscriptionIdStr{SubscriptionIdStr: "subscription"},
-		DataGpbkv: []*telemetryBis.TelemetryField{
+		NodeId:       &telemetry.Telemetry_NodeIdStr{NodeIdStr: "hostname"},
+		Subscription: &telemetry.Telemetry_SubscriptionIdStr{SubscriptionIdStr: "subscription"},
+		DataGpbkv: []*telemetry.TelemetryField{
 			{
-				Fields: []*telemetryBis.TelemetryField{
+				Fields: []*telemetry.TelemetryField{
 					{
 						Name: "keys",
-						Fields: []*telemetryBis.TelemetryField{
+						Fields: []*telemetry.TelemetryField{
 							{
 								Name:        "sys/dme",
-								ValueByType: &telemetryBis.TelemetryField_StringValue{StringValue: "sys/dme"},
+								ValueByType: &telemetry.TelemetryField_StringValue{StringValue: "sys/dme"},
 							},
 						},
 					},
 					{
 						Name: "content",
-						Fields: []*telemetryBis.TelemetryField{
+						Fields: []*telemetry.TelemetryField{
 							{
-								Fields: []*telemetryBis.TelemetryField{
+								Fields: []*telemetry.TelemetryField{
 									{
 										Name: "children",
-										Fields: []*telemetryBis.TelemetryField{
+										Fields: []*telemetry.TelemetryField{
 											{
-												Fields: []*telemetryBis.TelemetryField{
+												Fields: []*telemetry.TelemetryField{
 													{
 														Name: "fooEntity",
-														Fields: []*telemetryBis.TelemetryField{
+														Fields: []*telemetry.TelemetryField{
 															{
-																Fields: []*telemetryBis.TelemetryField{
+																Fields: []*telemetry.TelemetryField{
 																	{
 																		Name: "attributes",
-																		Fields: []*telemetryBis.TelemetryField{
+																		Fields: []*telemetry.TelemetryField{
 																			{
-																				Fields: []*telemetryBis.TelemetryField{
+																				Fields: []*telemetry.TelemetryField{
 																					{
 																						Name: "foo",
-																						ValueByType: &telemetryBis.TelemetryField_StringValue{
+																						ValueByType: &telemetry.TelemetryField_StringValue{
 																							StringValue: "bar1",
 																						},
 																					},
 																					{
 																						Name: "dn",
-																						ValueByType: &telemetryBis.TelemetryField_StringValue{
+																						ValueByType: &telemetry.TelemetryField_StringValue{
 																							StringValue: "eth1/1",
 																						},
 																					},
@@ -890,26 +890,26 @@ func TestHandleNXDMESubtree(t *testing.T) {
 												},
 											},
 											{
-												Fields: []*telemetryBis.TelemetryField{
+												Fields: []*telemetry.TelemetryField{
 													{
 														Name: "fooEntity",
-														Fields: []*telemetryBis.TelemetryField{
+														Fields: []*telemetry.TelemetryField{
 															{
-																Fields: []*telemetryBis.TelemetryField{
+																Fields: []*telemetry.TelemetryField{
 																	{
 																		Name: "attributes",
-																		Fields: []*telemetryBis.TelemetryField{
+																		Fields: []*telemetry.TelemetryField{
 																			{
-																				Fields: []*telemetryBis.TelemetryField{
+																				Fields: []*telemetry.TelemetryField{
 																					{
 																						Name: "foo",
-																						ValueByType: &telemetryBis.TelemetryField_StringValue{
+																						ValueByType: &telemetry.TelemetryField_StringValue{
 																							StringValue: "bar2",
 																						},
 																					},
 																					{
 																						Name: "dn",
-																						ValueByType: &telemetryBis.TelemetryField_StringValue{
+																						ValueByType: &telemetry.TelemetryField_StringValue{
 																							StringValue: "eth1/2",
 																						},
 																					},
@@ -932,7 +932,7 @@ func TestHandleNXDMESubtree(t *testing.T) {
 				},
 			},
 		}}
-	data, err := proto.Marshal(telemetry)
+	data, err := proto.Marshal(tel)
 	require.NoError(t, err)
 
 	c.handleTelemetry(data)
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index 92a4a3c49..bbfc6ff38 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -898,10 +898,10 @@ func TestStartupErrorBehaviorRetryIntegration(t *testing.T) {
 
 	// Setup a writer
 	creator := outputs.Outputs["kafka"]
-	output, ok := creator().(*kafkaOutput.Kafka)
+	output, ok := creator().(*outputs_kafka.Kafka)
 	require.True(t, ok)
 
-	s := &influxSerializer.Serializer{}
+	s := &serializers_influx.Serializer{}
 	require.NoError(t, s.Init())
 	output.SetSerializer(s)
 	output.Brokers = brokers