Cleaning up file naming and references