Issue #12 changed file names