Updated naming and other small updates.