Changed bindings to decl for package components w.r.t
c7814edec854dd9f793abcac66d29a44ad3037e4 (bindings were changed to decl)