Fixed composer autoloader
Fixed some old naming