Updated naming conventions

#Yolo#420BlazeIT