Fix naming to be more Packagist compliant