package name changes & added registry