DINAA Id convention updated, added classes

Added two classes added naming convention