Update naming scheme

Updated naming scheme to make it compatible with all the other code.