Changing name of component class to make more sense....I think.