KT-2255, KT-3032 Rename function incorrectly renames backing fields

Simple fix for both issues(bug is same).
Please review this request, solution is simplest.