Revised naming scheme and updated composer.json