Updated naming convention
Updated doc