refactor some naming to prevent negative