changed interface to reflect changed naming conventions