Fix PSR-4 and variable name error