Merge pull request #5703 from rohitwaghchaure/timesheet_rename_issue

[Fix] Time sheet rename issues