Small Changes

class name changes