Dependency definition fixes

Use fully qualified dependency names.