updated to match the new naming conventions used in the library