Rename keySubkey to namespaced.
rename the files
clean up wrappedCallback