Cleanup for linux compatibility
Rename YAM to YAMR