Remove _ for psr-0 compliance