Updated naming guidelines.