* Rename files to avoid conflicts with OSATE2