diff --git a/diagoMiddleware.go b/diagoMiddleware.go
index c4ab3b6..69033c9 100644
--- a/diagoMiddleware.go
+++ b/diagoMiddleware.go
@@ -9,13 +9,13 @@ import (
 	"net/http"
 )
 
-type DiagoData struct {
+type Data struct {
 	ExtensionsPanelHtml []template.HTML
 	ExtensionsJSHtml    []template.HTML
 	ExtensionsHtml      []template.HTML
 }
 
-func DiagoMiddleware(r *router.Router, d *Diago) gin.HandlerFunc {
+func Middleware(r *router.Router, d *Diago) gin.HandlerFunc {
 	return func(c *gin.Context) {
 
 		if r != nil && r.IsRelease() {
@@ -56,7 +56,7 @@ func DiagoMiddleware(r *router.Router, d *Diago) gin.HandlerFunc {
 				extensionsJSHtml = append(extensionsJSHtml, template.HTML(e.GetJSHtml(c)))
 			}
 
-			diagoData := DiagoData{
+			diagoData := Data{
 				ExtensionsHtml:      extensionsHtml,
 				ExtensionsPanelHtml: extensionsPanelHtml,
 				ExtensionsJSHtml:    extensionsJSHtml,
diff --git a/tests/diagoLatencyExtension_test.go b/tests/diagoLatencyExtension_test.go
index f5b5c76..8098207 100644
--- a/tests/diagoLatencyExtension_test.go
+++ b/tests/diagoLatencyExtension_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestDiagoLatencyExtension(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	r := gin.Default()
 
@@ -43,7 +43,7 @@ func TestDiagoLatencyExtension(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_GetLatency(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 	latencyExtension.SetLatency(2 * time.Second)
 
 	latency := latencyExtension.GetLatency()
@@ -51,21 +51,21 @@ func TestDiagoLatencyExtension_GetLatency(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_GetHtml(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	html := latencyExtension.GetHtml(nil)
 	assert.Empty(t, html, "GetHtml should return an empty string")
 }
 
 func TestDiagoLatencyExtension_GetJSHtml(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	jsHtml := latencyExtension.GetJSHtml(nil)
 	assert.Empty(t, jsHtml, "GetJSHtml should return an empty string")
 }
 
 func TestDiagoLatencyExtension_GetPanelHtml_Seconds(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 	latencyExtension.SetLatency(2 * time.Second)
 
 	panelHtml := latencyExtension.GetPanelHtml(nil)
@@ -73,7 +73,7 @@ func TestDiagoLatencyExtension_GetPanelHtml_Seconds(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_GetPanelHtml_Milliseconds(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 	latencyExtension.SetLatency(150 * time.Millisecond)
 
 	panelHtml := latencyExtension.GetPanelHtml(nil)
@@ -81,7 +81,7 @@ func TestDiagoLatencyExtension_GetPanelHtml_Milliseconds(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_GetPanelHtml_Microseconds(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 	latencyExtension.SetLatency(500 * time.Microsecond)
 
 	panelHtml := latencyExtension.GetPanelHtml(nil)
@@ -89,7 +89,7 @@ func TestDiagoLatencyExtension_GetPanelHtml_Microseconds(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_GetPanelHtml_Nanoseconds(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 	latencyExtension.SetLatency(500 * time.Nanosecond)
 
 	panelHtml := latencyExtension.GetPanelHtml(nil)
@@ -103,7 +103,7 @@ func (m *mockDiagoPanelGeneratorWithError) GenerateHTML(name string, templatePro
 }
 
 func TestDiagoLatencyExtension_GetPanelHtml_ErrorHandling(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	gen := &mockDiagoPanelGeneratorWithError{}
 	latencyExtension.PanelGenerator = gen
@@ -134,7 +134,7 @@ func (m *mockTemplateProviderWithExecuteError) GetTemplate() string {
 func TestGenerateDiagoPanelHTML_TemplateParseError(t *testing.T) {
 	mockProvider := &mockTemplateProviderWithParseError{}
 
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	result, err := latencyExtension.PanelGenerator.GenerateHTML("error", mockProvider, extensions.LatencyData{Latency: "500 ms"})
 
@@ -151,7 +151,7 @@ func (m *mockInvalidTemplateProvider) GetDiagoLatencyPanelTemplate() string {
 func TestGenerateDiagoPanelHTML_TemplateExecuteError(t *testing.T) {
 	mockProvider := &mockTemplateProviderWithExecuteError{}
 
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	result, err := latencyExtension.PanelGenerator.GenerateHTML("test", mockProvider, extensions.LatencyData{Latency: "500 ms"})
 
@@ -160,7 +160,7 @@ func TestGenerateDiagoPanelHTML_TemplateExecuteError(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_TemplateProvider(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	mockProvider := &mockTemplateProviderWithParseError{}
 
@@ -170,7 +170,7 @@ func TestDiagoLatencyExtension_TemplateProvider(t *testing.T) {
 }
 
 func TestDiagoLatencyExtension_PanelGenerator(t *testing.T) {
-	latencyExtension := extensions.NewDiagoLatencyExtension()
+	latencyExtension := extensions.NewLatencyExtension()
 
 	mockProvider := &MockPanelGenerator{}
 
diff --git a/tests/diagoMiddleware_test.go b/tests/diagoMiddleware_test.go
index 6639c11..199603d 100644
--- a/tests/diagoMiddleware_test.go
+++ b/tests/diagoMiddleware_test.go
@@ -49,7 +49,7 @@ func TestDiagoMiddleware(t *testing.T) {
 
 	d.AddExtension(&MyExtension{})
 
-	r.GET("/test", diago.DiagoMiddleware(nil, d), func(c *gin.Context) {
+	r.GET("/test", diago.Middleware(nil, d), func(c *gin.Context) {
 		c.Header("Content-Type", "text/html; charset=utf-8")
 		c.String(200, "Hello, world!")
 	})
@@ -78,7 +78,7 @@ func TestDiagoMiddlewareReleaseMode(t *testing.T) {
 
 	d.AddExtension(&MyExtension{})
 
-	n.GET("/test", diago.DiagoMiddleware(r, d), func(c *gin.Context) {
+	n.GET("/test", diago.Middleware(r, d), func(c *gin.Context) {
 		c.Header("Content-Type", "text/html; charset=utf-8")
 		c.String(200, "Hello, world!")
 	})
diff --git a/tests/template_test.go b/tests/template_test.go
index f88112f..42fcf2c 100644
--- a/tests/template_test.go
+++ b/tests/template_test.go
@@ -38,7 +38,7 @@ func TestDiagoMiddleware_ContentTypeAndCharset(t *testing.T) {
 	n.LoadHTMLGlob("templates/*")
 	d := diago.NewDiago()
 
-	middleware := diago.DiagoMiddleware(r, d)
+	middleware := diago.Middleware(r, d)
 
 	n.Use(middleware)
 
@@ -72,7 +72,7 @@ func TestDiagoMiddleware_ContentTypeAndCharsetAdd(t *testing.T) {
 	d.AddContentCharset("utf-8")
 	d.AddContentType(diago.ContentType_HTML)
 
-	middleware := diago.DiagoMiddleware(r, d)
+	middleware := diago.Middleware(r, d)
 
 	n.Use(middleware)
 
@@ -103,7 +103,7 @@ func TestDiagoMiddleware_ContentTypeAndCharset_NotAllowed(t *testing.T) {
 		Charsets: []string{},
 	})
 
-	middleware := diago.DiagoMiddleware(r, d)
+	middleware := diago.Middleware(r, d)
 
 	n.Use(middleware)
 
@@ -132,7 +132,7 @@ func TestDiagoMiddleware_Handle_404(t *testing.T) {
 	n := r.GetNativeRouter()
 	n.LoadHTMLGlob("templates/*")
 
-	middleware := diago.DiagoMiddleware(r, &diago.Diago{PanelGenerator: mockPanelGenerator, TemplateProvider: diago.NewDefaultTemplateProvider()})
+	middleware := diago.Middleware(r, &diago.Diago{PanelGenerator: mockPanelGenerator, TemplateProvider: diago.NewDefaultTemplateProvider()})
 
 	n.Use(middleware)
 
@@ -154,7 +154,7 @@ func TestDiagoMiddleware_GenerateHTML_Error(t *testing.T) {
 	n := r.GetNativeRouter()
 	n.LoadHTMLGlob("templates/*")
 
-	middleware := diago.DiagoMiddleware(r, &diago.Diago{
+	middleware := diago.Middleware(r, &diago.Diago{
 		PanelGenerator:   mockPanelGenerator,
 		TemplateProvider: diago.NewDefaultTemplateProvider(),
 		AllowedContentTypes: diago.ContentType{