changed function names to reflect changes to package