Fixed file naming bugs.