Nomenclature; fixing issues with selector list; refactor