Fix composer psr-4 autoloading issue

Rename Classes for psr-4 autoloader support