Changing interfaces convetion to PSR