fixing up names and references
updating packaging