Fixed composer install and renamed variables