Fixed issues with package name