Bug Fix - Files are not being renamed