Cleaning up file name appropriately
Cleanup of capitalization