Renames the gem
Improves names
Fixes tests