Package name changes and Bugs resolving