fixes a bunch of names, adds #defs for compatibility, changes refresh to use delegate callbacks
more name fixes, more #defs
reduces import chaining
reduces import chaining