* Remove unnecessary string encoding on edit data naming * Cleaning up duplication in the naming methods. * fix typo in method name