Use the Id property when package name and id are different - fixes #265