Changed Naming

Changed names of files and slight content changes to match that.