Migrate naming convention to PSR standard