fix package naming in existing files