rename package
name fixes