updated composer name
a bit of refactoring