Changed namespace to fit with github