REFACTOR : changed names