Refactor to use Symfony naming conventions