Working on naming conventions based on working group recommendations
Renaming files to comply with the new standard