Fixed build errors with package names