Renamed interfaces and updated php-cs-fixer parsing