Rename to match github user
Fix package names