refactor / tweak names