fix ids to match package name
convert accidental tabs to spaces