* Replaced some logical id's by the new ones in 2.0 specs