switched file names, as they were wrong, and updated setters and getters