Changed to use more Eclipse-oriented naming