Naming FIle Convention

Updated File names for better naming convention