Rename types for PSR autoload compatibility