Bug fix file rename
Bug fix part 2.