JAL-3436 move/rename/private fields refactoring only