clean-up the rest of references to old package name (#28)

clean-up the rest of references to old package name (#28) #112