improve naming of adaptor usage in ui related stuff