fix package name in template call, remove unneeded patch,