Renaming to match gem name
More tweaks