Changed names so that fewer imports are needed when using the lib