diff --git a/Makefile b/Makefile
index 6854dac..623c668 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 NAME 		= embdr
 MAIN		= cmd/${NAME}/main.go
-SOURCES 	= $(wildcard *.go) ${MAIN}
+SOURCES 	= $(wildcard *.go) $(wildcard cmd/emdbr/*.go)
 COVERAGE	= target/coverage.txt
 LINT_REPORT	= target/lint.txt
 BINARY		= target/${NAME}
diff --git a/template_test.go b/template_test.go
index c5114a1..3da693d 100644
--- a/template_test.go
+++ b/template_test.go
@@ -16,20 +16,20 @@ func TestTemplate(t *testing.T) {
 	expected, err := ioutil.ReadFile(filename)
 	noErrorf(t, err, "failed to read %s", filename)
 
-	got, err := embdr.LoadTemplate(filename)
+	got, err := embdr.Load(filename)
 	noErrorf(t, err, "failed get template for %s", filename)
 
 	isTruef(t, string(expected) == got, "content of file %s doesn't match stored data", filename)
 }
 
 func TestTemplateNotFound(t *testing.T) {
-	_, err := embdr.LoadTemplate("foo")
+	_, err := embdr.Load("foo")
 	isTruef(t, err == embdr.ErrTemplateDoesNotExist, "expected 'embdr.ErrTemplateDoesNotExist' error, got '%s'", err)
 }
 
 func ExampleTemplate() {
 	const name = "template.tmpl"
-	tmpl, err := embdr.LoadTemplate(name)
+	tmpl, err := embdr.Load(name)
 	if err != nil {
 		log.Fatalf("Couldn't get template with name: %s", err)
 	}