Fix names, add export for package