diff --git a/Makefile.am b/Makefile.am
index 6b47db2fab..8524bebdbd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = sources sources/glue doc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gst-sharp-1.0.pc
+pkgconfig_DATA = gstreamer-sharp-1.0.pc
 
-EXTRA_DIST = gst-sharp-1.0.pc.in
-DISTCLEANFILES = gst-sharp-1.0.pc
+EXTRA_DIST = gstreamer-sharp-1.0.pc.in
+DISTCLEANFILES = gstreamer-sharp-1.0.pc
 
diff --git a/configure.ac b/configure.ac
index ef9551eb49..c975fa95b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([gst-sharp], [1.0.6])
+AC_INIT([gstreamer-sharp], [1.0.6])
 AC_CONFIG_SRCDIR([README])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -10,10 +10,10 @@ dnl Package settings
 ASSEMBLY_COMPANY=""
 ASSEMBLY_COPYRIGHT="2012 Andreia Gaita"
 ASSEMBLY_DESCRIPTION="Gst-1.0 bindings for Mono"
-ASSEMBLY_NAME="gst-sharp"
+ASSEMBLY_NAME="gstreamer-sharp"
 ASSEMBLY_NAMESPACE="Gst"
-ASSEMBLY_PC="gst-sharp-1.0"
-ASSEMBLY_SHORTNAME="gst"
+ASSEMBLY_PC="gstreamer-sharp-1.0"
+ASSEMBLY_SHORTNAME="gstreamer"
 ASSEMBLY_TITLE="Gst#"
 ASSEMBLY_VERSION="1.0.6"
 AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"])
@@ -132,8 +132,8 @@ AC_SUBST(MONODOCER)
 AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_monodoc" = "xyes")
 dnl Check for Gst
 PKG_CHECK_MODULES(GST, gstreamer-1.0)
-gst_prefix=/usr
-AC_SUBST(gst_prefix)
+gstreamer_prefix=/usr
+AC_SUBST(gstreamer_prefix)
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
 
@@ -144,7 +144,7 @@ AC_CONFIG_FILES([
 	sources/Makefile
 	sources/glue/Makefile
 	sources/AssemblyInfo.cs
-	gst-sharp-1.0.pc
+	gstreamer-sharp-1.0.pc
 	doc/Makefile
 ])
 AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h ]],[[]])
diff --git a/gst-sharp-1.0.pc.in b/gstreamer-sharp-1.0.pc.in
similarity index 100%
rename from gst-sharp-1.0.pc.in
rename to gstreamer-sharp-1.0.pc.in
diff --git a/out/gst-sharp.dll.config b/out/gstreamer-sharp.dll.config
similarity index 100%
rename from out/gst-sharp.dll.config
rename to out/gstreamer-sharp.dll.config
diff --git a/sources/Makefile.am b/sources/Makefile.am
index bc3884b806..04fbede867 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -32,7 +32,7 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
 generated-stamp: $(API)
 	 $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GTK_SHARP_CFLAGS) \
 		--outdir=generated \
-		--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstsharpglue-1.0.6.so \
+		--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libgstreamersharpglue-1.0.6.so \
 		--glue-includes=gst/gst.h \
 	 	--assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp
 
diff --git a/sources/glue/Makefile.am b/sources/glue/Makefile.am
index eb12645d94..446b86bdd0 100644
--- a/sources/glue/Makefile.am
+++ b/sources/glue/Makefile.am
@@ -1,17 +1,17 @@
-lib_LTLIBRARIES = libgstsharpglue-1.0.6.la
-# TODO: Select all files except generated.c dynamically
-libgstsharpglue_1_0_6_la_SOURCES = gobject.c
+lib_LTLIBRARIES = libgstreamersharpglue-1.0.6.la
 
-nodist_libgstsharpglue_1_0_6_la_SOURCES = generated.c
+libgstreamersharpglue_1_0_6_la_SOURCES = gobject.c
 
-libgstsharpglue_1_0_6_la_LDFLAGS = -module -avoid-version -no-undefined
+nodist_libgstreamersharpglue_1_0_6_la_SOURCES = generated.c
 
-libgstsharpglue_1_0_6_la_LIBADD = $(GST_LIBS)
+libgstreamersharpglue_1_0_6_la_LDFLAGS = -module -avoid-version -no-undefined
+
+libgstreamersharpglue_1_0_6_la_LIBADD = $(GST_LIBS)
 
 INCLUDES = $(GST_CFLAGS) -I$(top_srcdir)
 
-libgstsharpglue.dll: $(libgstsharpglue_1_0_6_la_OBJECTS) libgstsharpglue.rc libgstsharpglue.def
-	./build-dll libgstsharpglue $(VERSION)
+libgstreamersharpglue.dll: $(libgstreamersharpglue_1_0_6_la_OBJECTS) libgstreamersharpglue.rc libgstreamersharpglue.def
+	./build-dll libgstreamersharpglue $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll
 
diff --git a/sources/gst-sharp.snk b/sources/gst-sharp.snk
deleted file mode 100644
index 403c7ad206..0000000000
Binary files a/sources/gst-sharp.snk and /dev/null differ
diff --git a/sources/gst-sharp-api.raw b/sources/gstreamer-sharp-api.raw
similarity index 100%
rename from sources/gst-sharp-api.raw
rename to sources/gstreamer-sharp-api.raw
diff --git a/sources/gst-sharp.metadata b/sources/gstreamer-sharp.metadata
similarity index 90%
rename from sources/gst-sharp.metadata
rename to sources/gstreamer-sharp.metadata
index eb069feff3..58d536c698 100644
--- a/sources/gst-sharp.metadata
+++ b/sources/gstreamer-sharp.metadata
@@ -1,4 +1,21 @@
 <?xml version="1.0"?>
+
+<!--
+Copyright (C) 2013  Stephan Sundermann <stephansundermann@gmail.com>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <metadata>
 	<!-- Conflicts with structs -->
 	<attr path="/api/namespace/callback[@cname='GstMessageFunc']" name="name">MessageFunc</attr>
diff --git a/sources/gstreamer-sharp.snk b/sources/gstreamer-sharp.snk
new file mode 100644
index 0000000000..f1f07772ba
Binary files /dev/null and b/sources/gstreamer-sharp.snk differ