(TODO) Include package part name to top level closure names

 #KT-4234 Fixed
 #KT-4496 Fixed