Modified file names and did some basic naming convention management.