CE-1107 Rename methods for better precission