Change for new name convention to use with package manager