Bi 657 Change class names
Created by: RujitRaval
This PR changes the class names so that we can use the same classes in future implementations as well.
Please pull and test.
Issue fixed: BI-657 Convert class names from Oakland-specific to general names