DDF-795: Added null check, renamed types to metacard-types, fixed dependency