file naming changes and removed bug