Options name changes, readme update